Changeset 1ad19d5

Timestamp:

Sep 25, 2006, 10:45:14 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:

15f7d33

Parents:

0b2e09e

Message:

Updated Linux 2.6.18 patches

Location:

patches

Files:

• linux-2.6.18-alpha_io_fix-1.patch (moved) (moved from patches/linux-2.6.17.13-alpha_io_fix-1.patch)
• linux-2.6.18-mips-1.patch (moved) (moved from patches/linux-2.6.17.13-mips-2.patch) (122 diffs)
• linux-2.6.18-mips_fixes-1.patch (moved) (moved from patches/linux-2.6.17.13-mips_fixes-2.patch)
• linux-2.6.18-tulip-1.patch (moved) (moved from patches/linux-2.6.17.13-tulip-1.patch)

patches/linux-2.6.18-mips-1.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2006-09-16
-Initial Package Version: 2.6.17.13
+Date: 2006-09-23
+Initial Package Version: 2.6.18
 Origin: Linux-MIPS
 Upstream Status: http://www.linux-mips.org/pub/linux/mips/kernel/v2.6/
 
-diff -Naur linux-2.6.17.13.orig/arch/mips/cobalt/console.c linux-2.6.17.13/arch/mips/cobalt/console.c
---- linux-2.6.17.13.orig/arch/mips/cobalt/console.c     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/cobalt/console.c  2006-09-09 10:17:04.000000000 -0700
-@@ -41,3 +41,8 @@
- 
-        printk("Cobalt: early console registered\n");
- }
-+
-+void __init disable_early_printk(void)
-+{
-+       unregister_console(&cons_info);
-+}
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/atlas_defconfig linux-2.6.17.13/arch/mips/configs/atlas_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/atlas_defconfig      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/atlas_defconfig   2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
+diff -Naur linux-2.6.18/arch/mips/au1000/db1x00/Makefile linux-2.6.18.mips/arch/mips/au1000/db1x00/Makefile
+--- linux-2.6.18/arch/mips/au1000/db1x00/Makefile       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/au1000/db1x00/Makefile  2006-09-20 06:55:21.000000000 -0700
+@@ -6,4 +6,3 @@
+ # Makefile for the Alchemy Semiconductor Db1x00 board.
+ 
+ lib-y := init.o board_setup.o irqmap.o
+-obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o
+diff -Naur linux-2.6.18/arch/mips/au1000/db1x00/mirage_ts.c linux-2.6.18.mips/arch/mips/au1000/db1x00/mirage_ts.c
+--- linux-2.6.18/arch/mips/au1000/db1x00/mirage_ts.c    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/au1000/db1x00/mirage_ts.c       1969-12-31 16:00:00.000000000 -0800
+@@ -1,260 +0,0 @@
+-/*
+- * linux/arch/mips/au1000/db1x00/mirage_ts.c
+- *
+- * BRIEF MODULE DESCRIPTION
+- *     Glue between Mirage board-specific touchscreen pieces
+- *     and generic Wolfson Codec touchscreen support.
+- *
+- *     Based on pb1100_ts.c used in Hydrogen II.
+- *
+- * Copyright (c) 2003 Embedded Edge, LLC
+- *             dan@embeddededge.com
+- *
+- *  This program is free software; you can redistribute         it and/or modify it
+- *  under  the terms of         the GNU General  Public License as published by the
+- *  Free Software Foundation;  either version 2 of the License, or (at your
+- *  option) any later version.
+- *
+- *  THIS  SOFTWARE  IS PROVIDED          ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+- *  WARRANTIES,          INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+- *  NO EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+- *  NOT LIMITED          TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+- *  USE, DATA, OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+- *  ANY THEORY OF LIABILITY, WHETHER IN         CONTRACT, STRICT LIABILITY, OR TORT
+- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- *
+- *  You should have received a copy of the  GNU General Public License along
+- *  with this program; if not, write  to the Free Software Foundation, Inc.,
+- *  675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-#include <linux/types.h>
+-#include <linux/module.h>
+-#include <linux/sched.h>
+-#include <linux/kernel.h>
+-#include <linux/init.h>
+-#include <linux/fs.h>
+-#include <linux/poll.h>
+-#include <linux/proc_fs.h>
+-#include <linux/smp.h>
+-#include <linux/smp_lock.h>
+-#include <linux/wait.h>
+-
+-#include <asm/segment.h>
+-#include <asm/irq.h>
+-#include <asm/uaccess.h>
+-#include <asm/delay.h>
+-#include <asm/au1000.h>
+-
+-/*
+- *  Imported interface to Wolfson Codec driver.
+- */
+-extern void *wm97xx_ts_get_handle(int which);
+-extern int wm97xx_ts_ready(void* ts_handle);
+-extern void wm97xx_ts_set_cal(void* ts_handle, int xscale, int xtrans, int yscale, int ytrans);
+-extern u16 wm97xx_ts_get_ac97(void* ts_handle, u8 reg);
+-extern void wm97xx_ts_set_ac97(void* ts_handle, u8 reg, u16 val);
+-extern int wm97xx_ts_read_data(void* ts_handle, long* x, long* y, long* pressure);
+-extern void wm97xx_ts_send_data(void* ts_handle, long x, long y, long z);
+-
+-int wm97xx_comodule_present = 1;
+-
+-
+-#define TS_NAME "mirage_ts"
+-
+-#define err(format, arg...) printk(KERN_ERR TS_NAME ": " format "\n" , ## arg)
+-#define info(format, arg...) printk(KERN_INFO TS_NAME ": " format "\n" , ## arg)
+-#define warn(format, arg...) printk(KERN_WARNING TS_NAME ": " format "\n" , ## arg)
+-#define DPRINTK(format, arg...) printk("%s: " format "\n", __FUNCTION__ , ## arg)
+-
+-
+-#define PEN_DOWN_IRQ   AU1000_GPIO_7
+-
+-static struct task_struct *ts_task = 0;
+-static DECLARE_COMPLETION(ts_complete);
+-static DECLARE_WAIT_QUEUE_HEAD(pendown_wait);
+-
+-#ifdef CONFIG_WM97XX_FIVEWIRETS
+-static int release_pressure = 1;
+-#else
+-static int release_pressure = 50;
+-#endif
+-
+-typedef struct {
+-   long x;
+-   long y;
+-} DOWN_EVENT;
+-
+-#define SAMPLE_RATE    50      /* samples per second */
+-#define PEN_DEBOUNCE   5       /* samples for settling - fn of SAMPLE_RATE */
+-#define PEN_UP_TIMEOUT 10      /* in seconds */
+-#define PEN_UP_SETTLE  5       /* samples per second */
+-
+-static struct {
+-       int xscale;
+-       int xtrans;
+-       int yscale;
+-       int ytrans;
+-} mirage_ts_cal =
+-{
+-#if 0
+-       .xscale   = 84,
+-       .xtrans = -157,
+-       .yscale   = 66,
+-       .ytrans = -150,
+-#else
+-       .xscale   = 84,
+-       .xtrans = -150,
+-       .yscale   = 66,
+-       .ytrans = -146,
+-#endif
+-};
+-
+-
+-static void pendown_irq(int irqnr, void *devid, struct pt_regs *regs)
+-{
+-//DPRINTK("got one 0x%x", au_readl(SYS_PINSTATERD));
+-       wake_up(&pendown_wait);
+-}
+-
+-static int ts_thread(void *id)
+-{
+-       static int pen_was_down = 0;
+-       static DOWN_EVENT pen_xy;
+-       long x, y, z;
+-       void *ts;       /* handle */
+-       struct task_struct *tsk = current;
+-       int timeout = HZ / SAMPLE_RATE;
+-
+-       ts_task = tsk;
+-
+-       daemonize();
+-       tsk->tty = NULL;
+-       tsk->policy = SCHED_FIFO;
+-       tsk->rt_priority = 1;
+-       strcpy(tsk->comm, "touchscreen");
+-
+-       /* only want to receive SIGKILL */
+-       spin_lock_irq(&tsk->sigmask_lock);
+-       siginitsetinv(&tsk->blocked, sigmask(SIGKILL));
+-       recalc_sigpending(tsk);
+-       spin_unlock_irq(&tsk->sigmask_lock);
+-
+-       /* get handle for codec */
+-       ts = wm97xx_ts_get_handle(0);
+-
+-       /* proceed only after everybody is ready */
+-       wait_event_timeout(pendown_wait, wm97xx_ts_ready(ts), HZ/4);
+-
+-       /* board-specific calibration */
+-       wm97xx_ts_set_cal(ts,
+-                       mirage_ts_cal.xscale,
+-                       mirage_ts_cal.xtrans,
+-                       mirage_ts_cal.yscale,
+-                       mirage_ts_cal.ytrans);
+-
+-       /* route Wolfson pendown interrupts to our GPIO */
+-       au_sync();
+-       wm97xx_ts_set_ac97(ts, 0x4c, wm97xx_ts_get_ac97(ts, 0x4c) & ~0x0008);
+-       au_sync();
+-       wm97xx_ts_set_ac97(ts, 0x56, wm97xx_ts_get_ac97(ts, 0x56) & ~0x0008);
+-       au_sync();
+-       wm97xx_ts_set_ac97(ts, 0x52, wm97xx_ts_get_ac97(ts, 0x52) | 0x2008);
+-       au_sync();
+-
+-       for (;;) {
+-               interruptible_sleep_on_timeout(&pendown_wait, timeout);
+-               disable_irq(PEN_DOWN_IRQ);
+-               if (signal_pending(tsk)) {
+-                       break;
+-               }
+-
+-               /* read codec */
+-               if (!wm97xx_ts_read_data(ts, &x, &y, &z))
+-                       z = 0;  /* treat no-data and pen-up the same */
+-
+-               if (signal_pending(tsk)) {
+-                       break;
+-               }
+-
+-               if (z >= release_pressure) {
+-                       y = ~y; /* top to bottom */
+-                       if (pen_was_down > 1 /*&& pen_was_down < PEN_DEBOUNCE*/) {//THXXX
+-                               /* bounce ? */
+-                               x = pen_xy.x;
+-                               y = pen_xy.y;
+-                               --pen_was_down;
+-                       } else if (pen_was_down <= 1) {
+-                               pen_xy.x = x;
+-                               pen_xy.y = y;
+-                               if (pen_was_down)
+-                                       wm97xx_ts_send_data(ts, x, y, z);
+-                               pen_was_down = PEN_DEBOUNCE;
+-                       }
+-                       //wm97xx_ts_send_data(ts, x, y, z);
+-                       timeout = HZ / SAMPLE_RATE;
+-               } else {
+-                       if (pen_was_down) {
+-                               if (--pen_was_down)
+-                                       z = release_pressure;
+-                               else //THXXX
+-                               wm97xx_ts_send_data(ts, pen_xy.x, pen_xy.y, z);
+-                       }
+-                       /* The pendown signal takes some time to settle after
+-                        * reading the pen pressure so wait a little
+-                        * before enabling the pen.
+-                        */
+-                       if (! pen_was_down) {
+-//                             interruptible_sleep_on_timeout(&pendown_wait, HZ / PEN_UP_SETTLE);
+-                               timeout = HZ * PEN_UP_TIMEOUT;
+-                       }
+-               }
+-               enable_irq(PEN_DOWN_IRQ);
+-       }
+-       enable_irq(PEN_DOWN_IRQ);
+-       ts_task = NULL;
+-       complete(&ts_complete);
+-       return 0;
+-}
+-
+-static int __init ts_mirage_init(void)
+-{
+-       int ret;
+-
+-       /* pen down signal is connected to GPIO 7 */
+-
+-       ret = request_irq(PEN_DOWN_IRQ, pendown_irq, 0, "ts-pendown", NULL);
+-       if (ret) {
+-               err("unable to get pendown irq%d: [%d]", PEN_DOWN_IRQ, ret);
+-               return ret;
+-       }
+-
+-       lock_kernel();
+-       ret = kernel_thread(ts_thread, NULL, CLONE_FS | CLONE_FILES);
+-       if (ret < 0) {
+-               unlock_kernel();
+-               return ret;
+-       }
+-       unlock_kernel();
+-
+-       info("Mirage touchscreen IRQ initialized.");
+-
+-       return 0;
+-}
+-
+-static void __exit ts_mirage_exit(void)
+-{
+-       if (ts_task) {
+-               send_sig(SIGKILL, ts_task, 1);
+-               wait_for_completion(&ts_complete);
+-       }
+-
+-       free_irq(PEN_DOWN_IRQ, NULL);
+-}
+-
+-module_init(ts_mirage_init);
+-module_exit(ts_mirage_exit);
+-
+diff -Naur linux-2.6.18/arch/mips/configs/e55_defconfig linux-2.6.18.mips/arch/mips/configs/e55_defconfig
+--- linux-2.6.18/arch/mips/configs/e55_defconfig        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/configs/e55_defconfig   2006-09-20 06:55:21.000000000 -0700
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.18-rc1
+-# Thu Jul  6 10:04:02 2006
++# Linux kernel version: 2.6.18-rc2
++# Tue Jul 25 23:15:03 2006
+ #
+ CONFIG_MIPS=y
+ 
+@@ -227,7 +227,6 @@
+ #
+ # PCCARD (PCMCIA/CardBus) support
+ #
+-# CONFIG_PCCARD is not set
+ 
+ #
+ # PCI Hotplug Support
+@@ -254,7 +253,6 @@
+ #
+ CONFIG_STANDALONE=y
+ CONFIG_PREVENT_FIRMWARE_BUILD=y
+-# CONFIG_FW_LOADER is not set
+ # CONFIG_SYS_HYPERVISOR is not set
+ 
+ #
+@@ -284,6 +282,7 @@
+ CONFIG_BLK_DEV_RAM=m
+ CONFIG_BLK_DEV_RAM_COUNT=16
+ CONFIG_BLK_DEV_RAM_SIZE=4096
++CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+ # CONFIG_BLK_DEV_INITRD is not set
+ # CONFIG_CDROM_PKTCDVD is not set
+ 
+@@ -643,6 +642,7 @@
+ #
+ # Kernel hacking
+ #
++CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+ # CONFIG_PRINTK_TIME is not set
+ # CONFIG_MAGIC_SYSRQ is not set
+ # CONFIG_UNUSED_SYMBOLS is not set
+@@ -650,7 +650,7 @@
+ CONFIG_LOG_BUF_SHIFT=14
+ # CONFIG_DEBUG_FS is not set
+ CONFIG_CROSSCOMPILE=y
+-CONFIG_CMDLINE="console=ttyVR0,19200 mem=8M"
++CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
+ 
+ #
+ # Security options
+diff -Naur linux-2.6.18/arch/mips/configs/mpc30x_defconfig linux-2.6.18.mips/arch/mips/configs/mpc30x_defconfig
+--- linux-2.6.18/arch/mips/configs/mpc30x_defconfig     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/configs/mpc30x_defconfig        2006-09-20 06:55:21.000000000 -0700
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.18-rc1
+-# Thu Jul  6 10:04:15 2006
++# Linux kernel version: 2.6.18-rc2
++# Tue Jul 25 23:16:46 2006
+ #
+ CONFIG_MIPS=y
+ 
+@@ -71,7 +71,6 @@
+ CONFIG_VICTOR_MPC30X=y
+ # CONFIG_ZAO_CAPCELLA is not set
+ CONFIG_PCI_VR41XX=y
+-CONFIG_VRC4173=y
+ CONFIG_RWSEM_GENERIC_SPINLOCK=y
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_MIPS_BONITO64=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/bigsur_defconfig linux-2.6.17.13/arch/mips/configs/bigsur_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/bigsur_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/bigsur_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -83,6 +83,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_COHERENT=y
- CONFIG_CPU_BIG_ENDIAN=y
- # CONFIG_CPU_LITTLE_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/capcella_defconfig linux-2.6.17.13/arch/mips/configs/capcella_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/capcella_defconfig   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/capcella_defconfig        2006-09-09 10:17:04.000000000 -0700
-@@ -75,6 +75,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/cobalt_defconfig linux-2.6.17.13/arch/mips/configs/cobalt_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/cobalt_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/cobalt_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -68,6 +68,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_I8259=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/db1000_defconfig linux-2.6.17.13/arch/mips/configs/db1000_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/db1000_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/db1000_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/db1100_defconfig linux-2.6.17.13/arch/mips/configs/db1100_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/db1100_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/db1100_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/db1200_defconfig linux-2.6.17.13/arch/mips/configs/db1200_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/db1200_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/db1200_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_COHERENT=y
- CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/db1500_defconfig linux-2.6.17.13/arch/mips/configs/db1500_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/db1500_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/db1500_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/db1550_defconfig linux-2.6.17.13/arch/mips/configs/db1550_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/db1550_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/db1550_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ddb5476_defconfig linux-2.6.17.13/arch/mips/configs/ddb5476_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ddb5476_defconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ddb5476_defconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_I8259=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ddb5477_defconfig linux-2.6.17.13/arch/mips/configs/ddb5477_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ddb5477_defconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ddb5477_defconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -68,6 +68,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_I8259=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/decstation_defconfig linux-2.6.17.13/arch/mips/configs/decstation_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/decstation_defconfig 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/decstation_defconfig      2006-09-09 10:17:04.000000000 -0700
-@@ -68,6 +68,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/e55_defconfig linux-2.6.17.13/arch/mips/configs/e55_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/e55_defconfig        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/e55_defconfig     2006-09-09 10:17:04.000000000 -0700
-@@ -73,6 +73,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ev64120_defconfig linux-2.6.17.13/arch/mips/configs/ev64120_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ev64120_defconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ev64120_defconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -68,6 +68,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_CPU_BIG_ENDIAN=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ev96100_defconfig linux-2.6.17.13/arch/mips/configs/ev96100_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ev96100_defconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ev96100_defconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_CPU_BIG_ENDIAN=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ip22_defconfig linux-2.6.17.13/arch/mips/configs/ip22_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ip22_defconfig       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ip22_defconfig    2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_ARC=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ip27_defconfig linux-2.6.17.13/arch/mips/configs/ip27_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ip27_defconfig       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ip27_defconfig    2006-09-09 10:17:04.000000000 -0700
-@@ -73,6 +73,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_ARC=y
- CONFIG_DMA_IP27=y
- CONFIG_CPU_BIG_ENDIAN=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ip32_defconfig linux-2.6.17.13/arch/mips/configs/ip32_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ip32_defconfig       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ip32_defconfig    2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_ARC=y
- CONFIG_DMA_IP32=y
- CONFIG_DMA_NONCOHERENT=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/it8172_defconfig linux-2.6.17.13/arch/mips/configs/it8172_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/it8172_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/it8172_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -68,6 +68,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ivr_defconfig linux-2.6.17.13/arch/mips/configs/ivr_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ivr_defconfig        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ivr_defconfig     2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/jaguar-atx_defconfig linux-2.6.17.13/arch/mips/configs/jaguar-atx_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/jaguar-atx_defconfig 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/jaguar-atx_defconfig      2006-09-09 10:17:04.000000000 -0700
-@@ -68,6 +68,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_LIMITED_DMA=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/jmr3927_defconfig linux-2.6.17.13/arch/mips/configs/jmr3927_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/jmr3927_defconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/jmr3927_defconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_CPU_BIG_ENDIAN=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/lasat200_defconfig linux-2.6.17.13/arch/mips/configs/lasat200_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/lasat200_defconfig   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/lasat200_defconfig        2006-09-09 10:17:04.000000000 -0700
-@@ -71,6 +71,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_MIPS_NILE4=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/malta_defconfig linux-2.6.17.13/arch/mips/configs/malta_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/malta_defconfig      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/malta_defconfig   2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_ARCH_MAY_HAVE_PC_FDC=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/mipssim_defconfig linux-2.6.17.13/arch/mips/configs/mipssim_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/mipssim_defconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/mipssim_defconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/mpc30x_defconfig linux-2.6.17.13/arch/mips/configs/mpc30x_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/mpc30x_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/mpc30x_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -75,6 +75,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ocelot_3_defconfig linux-2.6.17.13/arch/mips/configs/ocelot_3_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ocelot_3_defconfig   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ocelot_3_defconfig        2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_CPU_BIG_ENDIAN=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ocelot_c_defconfig linux-2.6.17.13/arch/mips/configs/ocelot_c_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ocelot_c_defconfig   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ocelot_c_defconfig        2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_CPU_BIG_ENDIAN=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ocelot_defconfig linux-2.6.17.13/arch/mips/configs/ocelot_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ocelot_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ocelot_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_CPU_BIG_ENDIAN=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/ocelot_g_defconfig linux-2.6.17.13/arch/mips/configs/ocelot_g_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/ocelot_g_defconfig   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/ocelot_g_defconfig        2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_CPU_BIG_ENDIAN=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/pb1100_defconfig linux-2.6.17.13/arch/mips/configs/pb1100_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/pb1100_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/pb1100_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/pb1500_defconfig linux-2.6.17.13/arch/mips/configs/pb1500_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/pb1500_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/pb1500_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/pb1550_defconfig linux-2.6.17.13/arch/mips/configs/pb1550_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/pb1550_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/pb1550_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/pnx8550-jbs_defconfig linux-2.6.17.13/arch/mips/configs/pnx8550-jbs_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/pnx8550-jbs_defconfig        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/pnx8550-jbs_defconfig     2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/pnx8550-v2pci_defconfig linux-2.6.17.13/arch/mips/configs/pnx8550-v2pci_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/pnx8550-v2pci_defconfig      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/pnx8550-v2pci_defconfig   2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/qemu_defconfig linux-2.6.17.13/arch/mips/configs/qemu_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/qemu_defconfig       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/qemu_defconfig    2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_COHERENT=y
- CONFIG_GENERIC_ISA_DMA=y
- CONFIG_I8259=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/rbhma4500_defconfig linux-2.6.17.13/arch/mips/configs/rbhma4500_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/rbhma4500_defconfig  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/rbhma4500_defconfig       2006-09-09 10:17:04.000000000 -0700
-@@ -74,6 +74,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- CONFIG_GENERIC_ISA_DMA=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/rm200_defconfig linux-2.6.17.13/arch/mips/configs/rm200_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/rm200_defconfig      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/rm200_defconfig   2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_ARC=y
- CONFIG_ARCH_MAY_HAVE_PC_FDC=y
- CONFIG_DMA_NONCOHERENT=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/sb1250-swarm_defconfig linux-2.6.17.13/arch/mips/configs/sb1250-swarm_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/sb1250-swarm_defconfig       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/sb1250-swarm_defconfig    2006-09-09 10:17:04.000000000 -0700
-@@ -84,6 +84,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_COHERENT=y
- CONFIG_CPU_BIG_ENDIAN=y
- # CONFIG_CPU_LITTLE_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/sead_defconfig linux-2.6.17.13/arch/mips/configs/sead_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/sead_defconfig       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/sead_defconfig    2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/tb0226_defconfig linux-2.6.17.13/arch/mips/configs/tb0226_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/tb0226_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/tb0226_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -77,6 +77,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/tb0229_defconfig linux-2.6.17.13/arch/mips/configs/tb0229_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/tb0229_defconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/tb0229_defconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -77,6 +77,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/workpad_defconfig linux-2.6.17.13/arch/mips/configs/workpad_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/workpad_defconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/workpad_defconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -73,6 +73,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
- # CONFIG_CPU_BIG_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/configs/yosemite_defconfig linux-2.6.17.13/arch/mips/configs/yosemite_defconfig
---- linux-2.6.17.13.orig/arch/mips/configs/yosemite_defconfig   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/configs/yosemite_defconfig        2006-09-09 10:17:04.000000000 -0700
-@@ -68,6 +68,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_DMA_COHERENT=y
- CONFIG_CPU_BIG_ENDIAN=y
- # CONFIG_CPU_LITTLE_ENDIAN is not set
-diff -Naur linux-2.6.17.13.orig/arch/mips/defconfig linux-2.6.17.13/arch/mips/defconfig
---- linux-2.6.17.13.orig/arch/mips/defconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/defconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -67,6 +67,7 @@
- CONFIG_GENERIC_FIND_NEXT_BIT=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_ARC=y
- CONFIG_DMA_NONCOHERENT=y
- CONFIG_DMA_NEED_PCI_MAP_STATE=y
-diff -Naur linux-2.6.17.13.orig/arch/mips/Kconfig linux-2.6.17.13/arch/mips/Kconfig
---- linux-2.6.17.13.orig/arch/mips/Kconfig      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/Kconfig   2006-09-09 10:17:04.000000000 -0700
-@@ -278,6 +278,7 @@
+@@ -168,6 +167,7 @@
+ CONFIG_SYSVIPC=y
+ # CONFIG_POSIX_MQUEUE is not set
+ # CONFIG_BSD_PROCESS_ACCT is not set
++# CONFIG_TASKSTATS is not set
+ CONFIG_SYSCTL=y
+ # CONFIG_AUDIT is not set
+ # CONFIG_IKCONFIG is not set
+@@ -841,7 +841,7 @@
+ # CONFIG_USB_LEGOTOWER is not set
+ # CONFIG_USB_LCD is not set
+ # CONFIG_USB_LED is not set
+-# CONFIG_USB_CY7C63 is not set
++# CONFIG_USB_CYPRESS_CY7C63 is not set
+ # CONFIG_USB_CYTHERM is not set
+ # CONFIG_USB_PHIDGETKIT is not set
+ # CONFIG_USB_PHIDGETSERVO is not set
+@@ -982,7 +982,6 @@
+ # CONFIG_RPCSEC_GSS_SPKM3 is not set
+ # CONFIG_SMB_FS is not set
+ # CONFIG_CIFS is not set
+-# CONFIG_CIFS_DEBUG2 is not set
+ # CONFIG_NCP_FS is not set
+ # CONFIG_CODA_FS is not set
+ # CONFIG_AFS_FS is not set
+@@ -1007,6 +1006,7 @@
+ #
+ # Kernel hacking
+ #
++CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+ # CONFIG_PRINTK_TIME is not set
+ # CONFIG_MAGIC_SYSRQ is not set
+ # CONFIG_UNUSED_SYMBOLS is not set
+@@ -1014,7 +1014,7 @@
+ CONFIG_LOG_BUF_SHIFT=14
+ # CONFIG_DEBUG_FS is not set
+ CONFIG_CROSSCOMPILE=y
+-CONFIG_CMDLINE="mem=32M console=ttyVR0,19200"
++CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73"
+ 
+ #
+ # Security options
+diff -Naur linux-2.6.18/arch/mips/configs/workpad_defconfig linux-2.6.18.mips/arch/mips/configs/workpad_defconfig
+--- linux-2.6.18/arch/mips/configs/workpad_defconfig    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/configs/workpad_defconfig       2006-09-20 06:55:21.000000000 -0700
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Linux kernel version: 2.6.18-rc1
+-# Thu Jul  6 10:04:21 2006
++# Linux kernel version: 2.6.18-rc2
++# Tue Jul 25 23:13:04 2006
+ #
+ CONFIG_MIPS=y
+ 
+@@ -166,6 +166,7 @@
+ CONFIG_SYSVIPC=y
+ # CONFIG_POSIX_MQUEUE is not set
+ # CONFIG_BSD_PROCESS_ACCT is not set
++# CONFIG_TASKSTATS is not set
+ CONFIG_SYSCTL=y
+ # CONFIG_AUDIT is not set
+ # CONFIG_IKCONFIG is not set
+@@ -379,6 +380,7 @@
+ CONFIG_BLK_DEV_RAM=m
+ CONFIG_BLK_DEV_RAM_COUNT=16
+ CONFIG_BLK_DEV_RAM_SIZE=4096
++CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+ # CONFIG_BLK_DEV_INITRD is not set
+ # CONFIG_CDROM_PKTCDVD is not set
+ # CONFIG_ATA_OVER_ETH is not set
+@@ -855,7 +857,6 @@
+ # CONFIG_RPCSEC_GSS_SPKM3 is not set
+ # CONFIG_SMB_FS is not set
+ # CONFIG_CIFS is not set
+-# CONFIG_CIFS_DEBUG2 is not set
+ # CONFIG_NCP_FS is not set
+ # CONFIG_CODA_FS is not set
+ # CONFIG_AFS_FS is not set
+@@ -880,6 +881,7 @@
+ #
+ # Kernel hacking
+ #
++CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+ # CONFIG_PRINTK_TIME is not set
+ # CONFIG_MAGIC_SYSRQ is not set
+ # CONFIG_UNUSED_SYMBOLS is not set
+@@ -887,7 +889,7 @@
+ CONFIG_LOG_BUF_SHIFT=14
+ # CONFIG_DEBUG_FS is not set
+ CONFIG_CROSSCOMPILE=y
+-CONFIG_CMDLINE="console=ttyVR0,19200 mem=16M"
++CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
+ 
+ #
+ # Security options
+diff -Naur linux-2.6.18/arch/mips/Kconfig linux-2.6.18.mips/arch/mips/Kconfig
+--- linux-2.6.18/arch/mips/Kconfig      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/Kconfig 2006-09-20 06:55:21.000000000 -0700
+@@ -126,7 +126,6 @@
+        select IRQ_CPU
+        select IRQ_CPU_RM7K
+        select IRQ_CPU_RM9K
+-       select SERIAL_RM9000
+        select SYS_HAS_CPU_RM9000
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_64BIT_KERNEL
+@@ -480,7 +479,6 @@
+        select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-+       select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
+-       select ARCH_SPARSEMEM_ENABLE
         help
-          This enables support for the MIPS Technologies Atlas evaluation
-          board.
-@@ -294,6 +295,7 @@
-        select I8259
-        select MIPS_BOARDS_GEN
-        select MIPS_BONITO64
-+       select MIPS_CPU_SCACHE
-        select MIPS_GT64120
-        select MIPS_MSC
-        select SWAP_IO_SPACE
-@@ -306,6 +308,7 @@
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-+       select SYS_SUPPORTS_MULTITHREADING
-        help
-          This enables support for the MIPS Technologies Malta evaluation
-          board.
-@@ -438,11 +441,13 @@
- 
- config PNX8550_V2PCI
-        bool "Philips PNX8550 based Viper2-PCI board"
-+       depends on BROKEN
-        select PNX8550
-        select SYS_SUPPORTS_LITTLE_ENDIAN
- 
- config PNX8550_JBS
-        bool "Philips PNX8550 based JBS board"
-+       depends on BROKEN
-        select PNX8550
-        select SYS_SUPPORTS_LITTLE_ENDIAN
- 
-@@ -506,8 +511,6 @@
+          The Ocelot is a MIPS-based Single Board Computer (SBC) made by
+          Momentum Computer <http://www.momenco.com/>.
+@@ -524,8 +522,6 @@
  config MACH_VR41XX
         bool "NEC VR41XX-based machines"
@@ -562 +476 @@
  config PMC_YOSEMITE
         bool "PMC-Sierra Yosemite eval board"
-@@ -522,6 +525,7 @@
+@@ -614,6 +610,7 @@
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_HIGHMEM
-+       select SYS_SUPPORTS_SMP
-        help
-          Yosemite is an evaluation board for the RM9000x2 processor
-          manufactured by PMC-Sierra.
-@@ -555,6 +559,7 @@
-        select HW_HAS_EISA
-        select IP22_CPU_SCACHE
-        select IRQ_CPU
-+       select NO_ISA if ISA
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_R4X00
-        select SYS_HAS_CPU_R5000
-@@ -577,6 +582,7 @@
-        select SYS_HAS_CPU_R10000
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_NUMA
 +       select SYS_SUPPORTS_SMP
         help
           This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics
           workstations.  To compile a Linux kernel that runs on these, say Y
-@@ -1035,6 +1041,9 @@
- config HAVE_STD_PC_SERIAL_PORT
-        bool
- 
-+config VR4181
-+       bool
-+
- config ARC_CONSOLE
-        bool "ARC console support"
-        depends on SGI_IP22 || SNI_RM200_PCI
-@@ -1155,7 +1164,7 @@
+@@ -1200,7 +1197,7 @@
         select CPU_SUPPORTS_32BIT_KERNEL
         select CPU_SUPPORTS_64BIT_KERNEL
@@ -605 +493 @@
           kernel built with this option will not run on any other type of
           processor or vice versa.
-@@ -1211,7 +1220,7 @@
-        select CPU_SUPPORTS_32BIT_KERNEL
+@@ -1527,6 +1524,7 @@
+        select CPU_MIPSR2_SRS
+        select MIPS_MT
+        select SMP
++       select SYS_SUPPORTS_SMP
         help
-          MIPS Technologies R6000 and R6000A series processors.  Note these
--         processors are extremly rare and the support for them is incomplete.
-+         processors are extremely rare and the support for them is incomplete.
- 
- config CPU_NEVADA
-        bool "RM52xx"
-@@ -1332,7 +1341,7 @@
- endmenu
+          This is a kernel model which is known a SMTC or lately has been
+          marketesed into SMVP.
+@@ -1538,6 +1536,7 @@
+        select CPU_MIPSR2_SRS
+        select MIPS_MT
+        select SMP
++       select SYS_SUPPORTS_SMP
+        help
+          This is a kernel model which is also known a VSMP or lately
+          has been marketesed into SMVP.
+@@ -1649,9 +1648,7 @@
+        default y
+ 
+ config IRQ_PER_CPU
+-       depends on SMP
+        bool
+-       default y
  
  #
--# These two indicate any levelof the MIPS32 and MIPS64 architecture
-+# These two indicate any level of the MIPS32 and MIPS64 architecture
- #
- config CPU_MIPS32
+ # - Highmem only makes sense for the 32-bit kernel.
+@@ -1691,9 +1688,6 @@
+ 
+ config ARCH_SPARSEMEM_ENABLE
         bool
-@@ -1343,7 +1352,7 @@
-        default y if CPU_MIPS64_R1 || CPU_MIPS64_R2
- 
- #
--# These two indicate the revision of the architecture, either 32 bot 64 bit.
-+# These two indicate the revision of the architecture, either Release 1 or Release 2
- #
- config CPU_MIPSR1
-        bool
-@@ -1436,6 +1445,13 @@
-        bool
-        select BOARD_SCACHE
- 
-+#
-+# Support for a MIPS32 / MIPS64 style S-caches
-+#
-+config MIPS_CPU_SCACHE
-+       bool
-+       select BOARD_SCACHE
-+
- config R5000_CPU_SCACHE
-        bool
-        select BOARD_SCACHE
-@@ -1455,32 +1471,57 @@
- config CPU_HAS_PREFETCH
-        bool
- 
--config MIPS_MT
--       bool "Enable MIPS MT"
 -
- choice
-        prompt "MIPS MT options"
--       depends on MIPS_MT
-+
-+config MIPS_MT_DISABLED
-+       bool "Disable multithreading support."
-+       help
-+         Use this option if your workload can't take advantage of
-+         MIPS hardware multithreading support.  On systems that don't have
-+         the option of an MT-enabled processor this option will be the only
-+         option in this menu.
- 
- config MIPS_MT_SMTC
-        bool "SMTC: Use all TCs on all VPEs for SMP"
-+       depends on CPU_MIPS32_R2
-+       #depends on CPU_MIPS64_R2               # once there is hardware ...
-+       depends on SYS_SUPPORTS_MULTITHREADING
-        select CPU_MIPSR2_IRQ_VI
-        select CPU_MIPSR2_SRS
-+       select MIPS_MT
-        select SMP
-+       help
-+         This is a kernel model which is known a SMTC or lately has been
-+         marketesed into SMVP.
- 
- config MIPS_MT_SMP
-        bool "Use 1 TC on each available VPE for SMP"
-+       depends on SYS_SUPPORTS_MULTITHREADING
-+       select CPU_MIPSR2_IRQ_VI
-+       select CPU_MIPSR2_SRS
-+       select MIPS_MT
-        select SMP
-+       help
-+         This is a kernel model which is also known a VSMP or lately
-+         has been marketesed into SMVP.
- 
- config MIPS_VPE_LOADER
-        bool "VPE loader support."
--       depends on MIPS_MT
-+       depends on SYS_SUPPORTS_MULTITHREADING
-+       select MIPS_MT
-        help
-          Includes a loader for loading an elf relocatable object
-          onto another VPE and running it.
- 
- endchoice
- 
-+config MIPS_MT
-+       bool
-+
-+config SYS_SUPPORTS_MULTITHREADING
-+       bool
-+
- config MIPS_MT_FPAFF
-        bool "Dynamic FPU affinity for FP-intensive threads"
-        depends on MIPS_MT
-@@ -1537,32 +1578,23 @@
- config CPU_HAS_WB
-        bool
- 
-+#
-+# Vectored interrupt mode is an R2 feature
-+#
- config CPU_MIPSR2_IRQ_VI
--       bool "Vectored interrupt mode"
--       depends on CPU_MIPSR2
--       help
--          Vectored interrupt mode allowing faster dispatching of interrupts.
--          The board support code needs to be written to take advantage of this
--          mode.  Compatibility code is included to allow the kernel to run on
--          a CPU that does not support vectored interrupts.  It's safe to
--          say Y here.
-+       bool
- 
-+#
-+# Extended interrupt mode is an R2 feature
-+#
- config CPU_MIPSR2_IRQ_EI
--       bool "External interrupt controller mode"
--       depends on CPU_MIPSR2
--       help
--          Extended interrupt mode takes advantage of an external interrupt
--          controller to allow fast dispatching from many possible interrupt
--          sources. Say N unless you know that external interrupt support is
--          required.
-+       bool
- 
-+#
-+# Shadow registers are an R2 feature
-+#
- config CPU_MIPSR2_SRS
--       bool "Make shadow set registers available for interrupt handlers"
--       depends on CPU_MIPSR2_IRQ_VI || CPU_MIPSR2_IRQ_EI
--       help
--          Allow the kernel to use shadow register sets for fast interrupts.
--          Interrupt handlers must be specially written to use shadow sets.
--          Say N unless you know that shadow register set upport is needed.
-+       bool
- 
- config CPU_HAS_SYNC
-        bool
-@@ -1616,8 +1648,8 @@
- 
+-config ARCH_SPARSEMEM_ENABLE
+-       bool
+        select SPARSEMEM_STATIC
+ 
+ config NUMA
+@@ -1719,6 +1713,7 @@
  config SMP
         bool "Multi-Processing support"
--       depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP || MIPS_MT_SMTC
--       ---help---
-+       depends on SYS_SUPPORTS_SMP
-+       help
+        depends on SYS_SUPPORTS_SMP
++       select IRQ_PER_CPU
+        help
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, like most personal computers, say N. If
-          you have a system with more than one CPU, say Y.
-@@ -1636,6 +1668,9 @@
- 
-          If you don't know what to do here, say N.
- 
-+config SYS_SUPPORTS_SMP
-+       bool
-+
- config NR_CPUS
-        int "Maximum number of CPUs (2-64)"
-        range 2 64
-@@ -1710,6 +1745,9 @@
- config ISA
-        bool
- 
-+config NO_ISA
-+       bool
-+
- config EISA
-        bool "EISA support"
-        depends on HW_HAS_EISA
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/cpu-probe.c linux-2.6.17.13/arch/mips/kernel/cpu-probe.c
---- linux-2.6.17.13.orig/arch/mips/kernel/cpu-probe.c   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/cpu-probe.c        2006-09-09 10:17:04.000000000 -0700
-@@ -111,7 +111,6 @@
+diff -Naur linux-2.6.18/arch/mips/kernel/cpu-probe.c linux-2.6.18.mips/arch/mips/kernel/cpu-probe.c
+--- linux-2.6.18/arch/mips/kernel/cpu-probe.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/cpu-probe.c      2006-09-20 06:55:21.000000000 -0700
+@@ -38,15 +38,40 @@
+ 
+ static void r39xx_wait(void)
+ {
+-       unsigned long cfg = read_c0_conf();
+-       write_c0_conf(cfg | TX39_CONF_HALT);
++       local_irq_disable();
++       if (!need_resched())
++               write_c0_conf(read_c0_conf() | TX39_CONF_HALT);
++       local_irq_enable();
+ }
+ 
++/*
++ * There is a race when WAIT instruction executed with interrupt
++ * enabled.
++ * But it is implementation-dependent wheter the pipelie restarts when
++ * a non-enabled interrupt is requested.
++ */
+ static void r4k_wait(void)
+ {
+-       __asm__(".set\tmips3\n\t"
+-               "wait\n\t"
+-               ".set\tmips0");
++       __asm__("       .set    mips3                   \n"
++               "       wait                            \n"
++               "       .set    mips0                   \n");
++}
++
++/*
++ * This variant is preferable as it allows testing need_resched and going to
++ * sleep depending on the outcome atomically.  Unfortunately the "It is
++ * implementation-dependent whether the pipeline restarts when a non-enabled
++ * interrupt is requested" restriction in the MIPS32/MIPS64 architecture makes
++ * using this version a gamble.
++ */
++static void r4k_wait_irqoff(void)
++{
++       local_irq_disable();
++       if (!need_resched())
++               __asm__("       .set    mips3           \n"
++                       "       wait                    \n"
++                       "       .set    mips0           \n");
++       local_irq_enable();
+ }
+ 
+ /* The Au1xxx wait is available only if using 32khz counter or
+@@ -56,17 +81,17 @@
+ static void au1k_wait(void)
+ {
+        /* using the wait instruction makes CP0 counter unusable */
+-       __asm__(".set mips3\n\t"
+-               "cache 0x14, 0(%0)\n\t"
+-               "cache 0x14, 32(%0)\n\t"
+-               "sync\n\t"
+-               "nop\n\t"
+-               "wait\n\t"
+-               "nop\n\t"
+-               "nop\n\t"
+-               "nop\n\t"
+-               "nop\n\t"
+-               ".set mips0\n\t"
++       __asm__("       .set    mips3                   \n"
++               "       cache   0x14, 0(%0)             \n"
++               "       cache   0x14, 32(%0)            \n"
++               "       sync                            \n"
++               "       nop                             \n"
++               "       wait                            \n"
++               "       nop                             \n"
++               "       nop                             \n"
++               "       nop                             \n"
++               "       nop                             \n"
++               "       .set    mips0                   \n"
+                : : "r" (au1k_wait));
+ }
+ 
+@@ -110,8 +135,6 @@
         case CPU_R5000:
         case CPU_NEVADA:
         case CPU_RM7000:
 -       case CPU_RM9000:
-        case CPU_TX49XX:
+-       case CPU_TX49XX:
         case CPU_4KC:
         case CPU_4KEC:
-@@ -137,6 +136,14 @@
+        case CPU_4KSC:
+@@ -125,6 +148,10 @@
+                cpu_wait = r4k_wait;
+                printk(" available.\n");
+                break;
++       case CPU_TX49XX:
++               cpu_wait = r4k_wait_irqoff;
++               printk(" available.\n");
++               break;
+        case CPU_AU1000:
+        case CPU_AU1100:
+        case CPU_AU1500:
+@@ -136,6 +163,14 @@
                 } else
                         printk(" unavailable.\n");
@@ -811 +650 @@
                 printk(" unavailable.\n");
                 break;
-@@ -243,9 +250,15 @@
-                break;
-        case PRID_IMP_VR41XX:
-                switch (c->processor_id & 0xf0) {
-+#ifndef CONFIG_VR4181
-                case PRID_REV_VR4111:
-                        c->cputype = CPU_VR4111;
-                        break;
-+#else
-+               case PRID_REV_VR4181:
-+                       c->cputype = CPU_VR4181;
-+                       break;
-+#endif
-                case PRID_REV_VR4121:
-                        c->cputype = CPU_VR4121;
-                        break;
-@@ -597,8 +610,6 @@
-                break;
-        case PRID_IMP_25KF:
-                c->cputype = CPU_25KF;
--               /* Probe for L2 cache */
--               c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
-                break;
-        case PRID_IMP_34K:
-                c->cputype = CPU_34K;
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/entry.S linux-2.6.17.13/arch/mips/kernel/entry.S
---- linux-2.6.17.13.orig/arch/mips/kernel/entry.S       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/entry.S    2006-09-09 10:17:04.000000000 -0700
-@@ -87,7 +87,7 @@
-        ori     v1, v0, TCSTATUS_IXMT
-        mtc0    v1, CP0_TCSTATUS
-        andi    v0, TCSTATUS_IXMT
--       ehb
-+       _ehb
-        mfc0    t0, CP0_TCCONTEXT
-        DMT     9                               # dmt t1
-        jal     mips_ihb
-@@ -95,7 +95,7 @@
-        andi    t3, t0, 0xff00
-        or      t2, t2, t3
-        mtc0    t2, CP0_STATUS
--       ehb
-+       _ehb
-        andi    t1, t1, VPECONTROL_TE
-        beqz    t1, 1f
-        EMT
-@@ -105,7 +105,7 @@
-        xori    v1, v1, TCSTATUS_IXMT
-        or      v1, v0, v1
-        mtc0    v1, CP0_TCSTATUS
--       ehb
-+       _ehb
-        xor     t0, t0, t3
-        mtc0    t0, CP0_TCCONTEXT
- #endif /* CONFIG_MIPS_MT_SMTC */
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/gdb-low.S linux-2.6.17.13/arch/mips/kernel/gdb-low.S
---- linux-2.6.17.13.orig/arch/mips/kernel/gdb-low.S     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/gdb-low.S  2006-09-09 10:17:04.000000000 -0700
-@@ -291,7 +291,7 @@
-                ori     t1, t2, TCSTATUS_IXMT
-                mtc0    t1, CP0_TCSTATUS
-                andi    t2, t2, TCSTATUS_IXMT
--               ehb
-+               _ehb
-                DMT     9                               # dmt   t1
-                jal     mips_ihb
-                nop
-@@ -310,7 +310,7 @@
-                xori    t1, t1, TCSTATUS_IXMT
-                or      t1, t1, t2
-                mtc0    t1, CP0_TCSTATUS
--               ehb
-+               _ehb
- #endif /* CONFIG_MIPS_MT_SMTC */
-                LONG_L  v0, GDB_FR_STATUS(sp)
-                LONG_L  v1, GDB_FR_EPC(sp)
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/genex.S linux-2.6.17.13/arch/mips/kernel/genex.S
---- linux-2.6.17.13.orig/arch/mips/kernel/genex.S       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/genex.S    2006-09-09 10:17:04.000000000 -0700
-@@ -214,7 +214,7 @@
-        mtc0    t0, CP0_TCCONTEXT
-        xor     t1, t1, t0
-        mtc0    t1, CP0_STATUS
--       ehb
-+       _ehb
- #endif /* CONFIG_MIPS_MT_SMTC */
-        CLI
-        move    a0, sp
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/head.S linux-2.6.17.13/arch/mips/kernel/head.S
---- linux-2.6.17.13.orig/arch/mips/kernel/head.S        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/head.S     2006-09-09 10:17:04.000000000 -0700
-@@ -96,7 +96,7 @@
-        /* Clear TKSU, leave IXMT */
-        xori    t0, 0x00001800
-        mtc0    t0, CP0_TCSTATUS
--       ehb
-+       _ehb
-        /* We need to leave the global IE bit set, but clear EXL...*/
-        mfc0    t0, CP0_STATUS
-        or      t0, ST0_CU0 | ST0_EXL | ST0_ERL | \set | \clr
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/irixsig.c linux-2.6.17.13/arch/mips/kernel/irixsig.c
---- linux-2.6.17.13.orig/arch/mips/kernel/irixsig.c     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/irixsig.c  2006-09-09 10:17:04.000000000 -0700
-@@ -185,9 +185,6 @@
+diff -Naur linux-2.6.18/arch/mips/kernel/irixsig.c linux-2.6.18.mips/arch/mips/kernel/irixsig.c
+--- linux-2.6.18/arch/mips/kernel/irixsig.c     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/irixsig.c        2006-09-20 06:55:21.000000000 -0700
+@@ -17,6 +17,7 @@
+ 
+ #include <asm/ptrace.h>
+ #include <asm/uaccess.h>
++#include <asm/unistd.h>
+ 
+ #undef DEBUG_SIG
+ 
+@@ -172,11 +173,12 @@
+        return ret;
+ }
+ 
+-asmlinkage int do_irix_signal(sigset_t *oldset, struct pt_regs *regs)
++void do_irix_signal(struct pt_regs *regs)
+ {
+        struct k_sigaction ka;
+        siginfo_t info;
+        int signr;
++       sigset_t *oldset;
+ 
+        /*
+         * We want the common case to go fast, which is why we may in certain
+@@ -184,19 +186,28 @@
+         * if so.
+         */
         if (!user_mode(regs))
-                return 1;
+-               return 1;
++               return;
  
 -       if (try_to_freeze())
 -               goto no_signal;
 -
-        if (!oldset)
+-       if (!oldset)
++       if (test_thread_flag(TIF_RESTORE_SIGMASK))
++               oldset = &current->saved_sigmask;
++       else
                 oldset = &current->blocked;
  
-@@ -195,7 +192,6 @@
-        if (signr > 0)
-                return handle_signal(signr, &info, &ka, oldset, regs);
+        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+-       if (signr > 0)
+-               return handle_signal(signr, &info, &ka, oldset, regs);
++       if (signr > 0) {
++               /* Whee!  Actually deliver the signal.  */
++               if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
++                       /* a signal was successfully delivered; the saved
++                        * sigmask will have been stored in the signal frame,
++                        * and will be restored by sigreturn, so we can simply
++                        * clear the TIF_RESTORE_SIGMASK flag */
++                       if (test_thread_flag(TIF_RESTORE_SIGMASK))
++                               clear_thread_flag(TIF_RESTORE_SIGMASK);
++               }
++
++               return;
++       }
  
 -no_signal:
@@ -932 +712 @@
          * Who's code doesn't conform to the restartable syscall convention
          * dies here!!!  The li instruction, a single machine instruction,
-@@ -207,6 +203,7 @@
+@@ -208,8 +219,22 @@
                     regs->regs[2] == ERESTARTNOINTR) {
                         regs->cp0_epc -= 8;
                 }
++               if (regs->regs[2] == ERESTART_RESTARTBLOCK) {
++                       regs->regs[2] = __NR_restart_syscall;
++                       regs->regs[7] = regs->regs[26];
++                       regs->cp0_epc -= 4;
++               }
 +               regs->regs[0] = 0;      /* Don't deal with this again.  */
++       }
++
++       /*
++       * If there's no signal to deliver, we just put the saved sigmask
++       * back
++       */
++       if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
++               clear_thread_flag(TIF_RESTORE_SIGMASK);
++               sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
         }
+-       return 0;
+ }
+ 
+ asmlinkage void
+@@ -413,7 +438,7 @@
+ 
+ asmlinkage int irix_sigsuspend(struct pt_regs *regs)
+ {
+-       sigset_t saveset, newset;
++       sigset_t newset;
+        sigset_t __user *uset;
+ 
+        uset = (sigset_t __user *) regs->regs[4];
+@@ -422,18 +447,15 @@
+        sigdelsetmask(&newset, ~_BLOCKABLE);
+ 
+        spin_lock_irq(&current->sighand->siglock);
+-       saveset = current->blocked;
++       current->saved_sigmask = current->blocked;
+        current->blocked = newset;
+        recalc_sigpending();
+        spin_unlock_irq(&current->sighand->siglock);
+ 
+-       regs->regs[2] = -EINTR;
+-       while (1) {
+-               current->state = TASK_INTERRUPTIBLE;
+-               schedule();
+-               if (do_irix_signal(&saveset, regs))
+-                       return -EINTR;
+-       }
++       current->state = TASK_INTERRUPTIBLE;
++       schedule();
++       set_thread_flag(TIF_RESTORE_SIGMASK);
++       return -ERESTARTNOHAND;
+ }
+ 
+ /* hate hate hate... */
+diff -Naur linux-2.6.18/arch/mips/kernel/linux32.c linux-2.6.18.mips/arch/mips/kernel/linux32.c
+--- linux-2.6.18/arch/mips/kernel/linux32.c     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/linux32.c        2006-09-20 06:55:21.000000000 -0700
+@@ -1296,9 +1296,3 @@
+        return do_fork(clone_flags, newsp, &regs, 0,
+                       parent_tidptr, child_tidptr);
+ }
+-
+-extern asmlinkage void sys_set_thread_area(u32 addr);
+-asmlinkage void sys32_set_thread_area(u32 addr)
+-{
+-       sys_set_thread_area(AA(addr));
+-}
+diff -Naur linux-2.6.18/arch/mips/kernel/mips-mt.c linux-2.6.18.mips/arch/mips/kernel/mips-mt.c
+--- linux-2.6.18/arch/mips/kernel/mips-mt.c     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/mips-mt.c        2006-09-20 06:55:21.000000000 -0700
+@@ -96,6 +96,10 @@
+                goto out_unlock;
+        }
+ 
++       retval = security_task_setscheduler(p, 0, NULL);
++       if (retval)
++               goto out_unlock;
++
+        /* Record new user-specified CPU set for future reference */
+        p->thread.user_cpus_allowed = new_mask;
+ 
+@@ -141,8 +145,9 @@
+        p = find_process_by_pid(pid);
+        if (!p)
+                goto out_unlock;
+-
+-       retval = 0;
++       retval = security_task_getscheduler(p);
++       if (retval)
++               goto out_unlock;
+ 
+        cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map);
+ 
+diff -Naur linux-2.6.18/arch/mips/kernel/process.c linux-2.6.18.mips/arch/mips/kernel/process.c
+--- linux-2.6.18/arch/mips/kernel/process.c     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/process.c        2006-09-20 06:55:21.000000000 -0700
+@@ -281,62 +281,63 @@
+ } *schedule_frame, mfinfo[64];
+ static int mfinfo_num;
+ 
+-static int __init get_frame_info(struct mips_frame_info *info)
++static inline int is_ra_save_ins(union mips_instruction *ip)
+ {
+-       int i;
+-       void *func = info->func;
+-       union mips_instruction *ip = (union mips_instruction *)func;
++       /* sw / sd $ra, offset($sp) */
++       return (ip->i_format.opcode == sw_op || ip->i_format.opcode == sd_op) &&
++               ip->i_format.rs == 29 &&
++               ip->i_format.rt == 31;
++}
++
++static inline int is_jal_jalr_jr_ins(union mips_instruction *ip)
++{
++       if (ip->j_format.opcode == jal_op)
++               return 1;
++       if (ip->r_format.opcode != spec_op)
++               return 0;
++       return ip->r_format.func == jalr_op || ip->r_format.func == jr_op;
++}
++
++static inline int is_sp_move_ins(union mips_instruction *ip)
++{
++       /* addiu/daddiu sp,sp,-imm */
++       if (ip->i_format.rs != 29 || ip->i_format.rt != 29)
++               return 0;
++       if (ip->i_format.opcode == addiu_op || ip->i_format.opcode == daddiu_op)
++               return 1;
++       return 0;
++}
++
++static int get_frame_info(struct mips_frame_info *info)
++{
++       union mips_instruction *ip = info->func;
++       int i, max_insns =
++               min(128UL, info->func_size / sizeof(union mips_instruction));
++
+        info->pc_offset = -1;
+        info->frame_size = 0;
+-       for (i = 0; i < 128; i++, ip++) {
+-               /* if jal, jalr, jr, stop. */
+-               if (ip->j_format.opcode == jal_op ||
+-                   (ip->r_format.opcode == spec_op &&
+-                    (ip->r_format.func == jalr_op ||
+-                     ip->r_format.func == jr_op)))
+-                       break;
+ 
+-               if (info->func_size && i >= info->func_size / 4)
+-                       break;
+-               if (
+-#ifdef CONFIG_32BIT
+-                   ip->i_format.opcode == addiu_op &&
+-#endif
+-#ifdef CONFIG_64BIT
+-                   ip->i_format.opcode == daddiu_op &&
+-#endif
+-                   ip->i_format.rs == 29 &&
+-                   ip->i_format.rt == 29) {
+-                       /* addiu/daddiu sp,sp,-imm */
+-                       if (info->frame_size)
+-                               continue;
+-                       info->frame_size = - ip->i_format.simmediate;
+-               }
++       for (i = 0; i < max_insns; i++, ip++) {
+ 
+-               if (
+-#ifdef CONFIG_32BIT
+-                   ip->i_format.opcode == sw_op &&
+-#endif
+-#ifdef CONFIG_64BIT
+-                   ip->i_format.opcode == sd_op &&
+-#endif
+-                   ip->i_format.rs == 29 &&
+-                   ip->i_format.rt == 31) {
+-                       /* sw / sd $ra, offset($sp) */
+-                       if (info->pc_offset != -1)
+-                               continue;
++               if (is_jal_jalr_jr_ins(ip))
++                       break;
++               if (!info->frame_size) {
++                       if (is_sp_move_ins(ip))
++                               info->frame_size = - ip->i_format.simmediate;
++                       continue;
++               }
++               if (info->pc_offset == -1 && is_ra_save_ins(ip)) {
+                        info->pc_offset =
+                                ip->i_format.simmediate / sizeof(long);
++                       break;
+                }
+        }
+-       if (info->pc_offset == -1 || info->frame_size == 0) {
+-               if (func == schedule)
+-                       printk("Can't analyze prologue code at %p\n", func);
+-               info->pc_offset = -1;
+-               info->frame_size = 0;
+-       }
+-
+-       return 0;
++       if (info->frame_size && info->pc_offset >= 0) /* nested */
++               return 0;
++       if (info->pc_offset < 0) /* leaf */
++               return 1;
++       /* prologue seems boggus... */
++       return -1;
+ }
+ 
+ static int __init frame_info_init(void)
+@@ -368,7 +369,14 @@
+        schedule_frame = &mfinfo[0];
+ #endif
+        for (i = 0; i < ARRAY_SIZE(mfinfo) && mfinfo[i].func; i++)
+-               get_frame_info(&mfinfo[i]);
++               get_frame_info(mfinfo + i);
++
++       /*
++        * Without schedule() frame info, result given by
++        * thread_saved_pc() and get_wchan() are not reliable.
++        */
++       if (schedule_frame->pc_offset < 0)
++               printk("Can't analyze schedule() prologue at %p\n", schedule);
+ 
+        mfinfo_num = i;
         return 0;
+@@ -427,6 +435,8 @@
+                if (i < 0)
+                        break;
+ 
++               if (mfinfo[i].pc_offset < 0)
++                       break;
+                pc = ((unsigned long *)frame)[mfinfo[i].pc_offset];
+                if (!mfinfo[i].frame_size)
+                        break;
+@@ -437,3 +447,49 @@
+        return pc;
  }
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/ptrace.c linux-2.6.17.13/arch/mips/kernel/ptrace.c
---- linux-2.6.17.13.orig/arch/mips/kernel/ptrace.c      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/ptrace.c   2006-09-09 10:17:04.000000000 -0700
-@@ -21,12 +21,12 @@
+ 
++#ifdef CONFIG_KALLSYMS
++/* used by show_backtrace() */
++unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
++                          unsigned long pc, unsigned long ra)
++{
++       unsigned long stack_page;
++       struct mips_frame_info info;
++       char *modname;
++       char namebuf[KSYM_NAME_LEN + 1];
++       unsigned long size, ofs;
++       int leaf;
++
++       stack_page = (unsigned long)task_stack_page(task);
++       if (!stack_page)
++               return 0;
++
++       if (!kallsyms_lookup(pc, &size, &ofs, &modname, namebuf))
++               return 0;
++       if (ofs == 0)
++               return 0;
++
++       info.func = (void *)(pc - ofs);
++       info.func_size = ofs;   /* analyze from start to ofs */
++       leaf = get_frame_info(&info);
++       if (leaf < 0)
++               return 0;
++
++       if (*sp < stack_page ||
++           *sp + info.frame_size > stack_page + THREAD_SIZE - 32)
++               return 0;
++
++       if (leaf)
++               /*
++                * For some extreme cases, get_frame_info() can
++                * consider wrongly a nested function as a leaf
++                * one. In that cases avoid to return always the
++                * same value.
++                */
++               pc = pc != ra ? ra : 0;
++       else
++               pc = ((unsigned long *)(*sp))[info.pc_offset];
++
++       *sp += info.frame_size;
++       return __kernel_text_address(pc) ? pc : 0;
++}
++#endif
+diff -Naur linux-2.6.18/arch/mips/kernel/ptrace.c linux-2.6.18.mips/arch/mips/kernel/ptrace.c
+--- linux-2.6.18/arch/mips/kernel/ptrace.c      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/ptrace.c 2006-09-20 06:55:21.000000000 -0700
+@@ -20,12 +20,12 @@
  #include <linux/mm.h>
  #include <linux/errno.h>
@@ -958 +1015 @@
  #include <asm/byteorder.h>
  #include <asm/cpu.h>
-@@ -482,12 +482,16 @@
+@@ -471,12 +471,16 @@
   */
  asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
@@ -975 +1032 @@
                 goto out;
  
-@@ -505,9 +509,14 @@
+@@ -494,9 +498,14 @@
                 send_sig(current->exit_code, current, 1);
                 current->exit_code = 0;
@@ -994 +1051 @@
 +                                   regs->regs[6], regs->regs[7]);
  }
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/r4k_switch.S linux-2.6.17.13/arch/mips/kernel/r4k_switch.S
---- linux-2.6.17.13.orig/arch/mips/kernel/r4k_switch.S  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/r4k_switch.S       2006-09-09 10:17:04.000000000 -0700
-@@ -75,8 +75,8 @@
-        and     t0, t0, t1
-        LONG_S  t0, ST_OFF(t3)
- 
--       fpu_save_double a0 t1 t0 t2             # c0_status passed in t1
--                                               # clobbers t0 and t2
-+       fpu_save_double a0 t0 t1                # c0_status passed in t0
-+                                               # clobbers t1
- 1:
- 
-        /*
-@@ -94,7 +94,7 @@
-        ori     t1, t2, TCSTATUS_IXMT
-        mtc0    t1, CP0_TCSTATUS
-        andi    t2, t2, TCSTATUS_IXMT
--       ehb
-+       _ehb
-        DMT     8                               # dmt   t0
-        move    t1,ra
-        jal     mips_ihb
-@@ -109,7 +109,7 @@
-        or      a2, t1
-        mtc0    a2, CP0_STATUS
- #ifdef CONFIG_MIPS_MT_SMTC
--       ehb
-+       _ehb
-        andi    t0, t0, VPECONTROL_TE
-        beqz    t0, 1f
-        emt
-@@ -118,7 +118,7 @@
-        xori    t1, t1, TCSTATUS_IXMT
-        or      t1, t1, t2
-        mtc0    t1, CP0_TCSTATUS
--       ehb
-+       _ehb
- #endif /* CONFIG_MIPS_MT_SMTC */
-        move    v0, a0
-        jr      ra
-@@ -129,9 +129,9 @@
-  */
- LEAF(_save_fp)
- #ifdef CONFIG_64BIT
--       mfc0    t1, CP0_STATUS
-+       mfc0    t0, CP0_STATUS
- #endif
--       fpu_save_double a0 t1 t0 t2             # clobbers t1
-+       fpu_save_double a0 t0 t1                # clobbers t1
-        jr      ra
-        END(_save_fp)
- 
-@@ -139,7 +139,10 @@
-  * Restore a thread's fp context.
-  */
- LEAF(_restore_fp)
--       fpu_restore_double a0, t1               # clobbers t1
-+#ifdef CONFIG_64BIT
-+       mfc0    t0, CP0_STATUS
-+#endif
-+       fpu_restore_double a0 t0 t1             # clobbers t1
-        jr      ra
-        END(_restore_fp)
- 
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/scall32-o32.S linux-2.6.17.13/arch/mips/kernel/scall32-o32.S
---- linux-2.6.17.13.orig/arch/mips/kernel/scall32-o32.S 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/scall32-o32.S      2006-09-09 10:17:04.000000000 -0700
-@@ -497,7 +497,7 @@
-        sys     sys_sched_get_priority_min 1
-        sys     sys_sched_rr_get_interval 2     /* 4165 */
-        sys     sys_nanosleep,          2
--       sys     sys_mremap,             4
-+       sys     sys_mremap,             5
-        sys     sys_accept              3
-        sys     sys_bind                3
-        sys     sys_connect             3       /* 4170 */
-@@ -647,6 +647,11 @@
-        sys     sys_unshare             1
-        sys     sys_splice              4
-        sys     sys_sync_file_range     7       /* 4305 */
-+       sys     sys_tee                 4
-+       sys     sys_vmsplice            4
-+       sys     sys_ni_syscall          0
+diff -Naur linux-2.6.18/arch/mips/kernel/scall32-o32.S linux-2.6.18.mips/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.18/arch/mips/kernel/scall32-o32.S 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/scall32-o32.S    2006-09-20 06:55:21.000000000 -0700
+@@ -662,6 +662,8 @@
+        sys     sys_tee                 4
+        sys     sys_vmsplice            4
+        sys     sys_move_pages          6
 +       sys     sys_set_robust_list     2
 +       sys     sys_get_robust_list     3
@@ -1083 +1063 @@
  
         /* We pre-compute the number of _instruction_ bytes needed to
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/scall64-64.S linux-2.6.17.13/arch/mips/kernel/scall64-64.S
---- linux-2.6.17.13.orig/arch/mips/kernel/scall64-64.S  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/scall64-64.S       2006-09-09 10:17:04.000000000 -0700
-@@ -462,3 +462,8 @@
-        PTR     sys_unshare
+diff -Naur linux-2.6.18/arch/mips/kernel/scall64-64.S linux-2.6.18.mips/arch/mips/kernel/scall64-64.S
+--- linux-2.6.18/arch/mips/kernel/scall64-64.S  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/scall64-64.S     2006-09-20 06:55:21.000000000 -0700
+@@ -466,3 +466,5 @@
+        PTR     sys_tee                         /* 5265 */
+        PTR     sys_vmsplice
+        PTR     sys_move_pages
++       PTR     sys_set_robust_list
++       PTR     sys_get_robust_list
+diff -Naur linux-2.6.18/arch/mips/kernel/scall64-n32.S linux-2.6.18.mips/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.18/arch/mips/kernel/scall64-n32.S 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/scall64-n32.S    2006-09-20 06:55:21.000000000 -0700
+@@ -247,7 +247,7 @@
+        PTR     sys_capset
+        PTR     sys32_rt_sigpending             /* 6125 */
+        PTR     compat_sys_rt_sigtimedwait
+-       PTR     sys_rt_sigqueueinfo
++       PTR     sys32_rt_sigqueueinfo
+        PTR     sysn32_rt_sigsuspend
+        PTR     sys32_sigaltstack
+        PTR     compat_sys_utime                /* 6130 */
+@@ -390,5 +390,7 @@
         PTR     sys_splice
         PTR     sys_sync_file_range
-+       PTR     sys_tee                         /* 5265 */
-+       PTR     sys_vmsplice
-+       PTR     sys_ni_syscall
-+       PTR     sys_set_robust_list
-+       PTR     sys_get_robust_list
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/scall64-n32.S linux-2.6.17.13/arch/mips/kernel/scall64-n32.S
---- linux-2.6.17.13.orig/arch/mips/kernel/scall64-n32.S 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/scall64-n32.S      2006-09-09 10:17:04.000000000 -0700
-@@ -388,3 +388,8 @@
-        PTR     sys_unshare
-        PTR     sys_splice
-        PTR     sys_sync_file_range
-+       PTR     sys_tee
+        PTR     sys_tee
+-       PTR     sys_vmsplice                    /* 6271 */
 +       PTR     sys_vmsplice                    /* 6270 */
-+       PTR     sys_ni_syscall
+        PTR     sys_move_pages
 +       PTR     compat_sys_set_robust_list
 +       PTR     compat_sys_get_robust_list
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/scall64-o32.S linux-2.6.17.13/arch/mips/kernel/scall64-o32.S
---- linux-2.6.17.13.orig/arch/mips/kernel/scall64-o32.S 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/scall64-o32.S      2006-09-09 10:17:04.000000000 -0700
-@@ -510,4 +510,9 @@
-        PTR     sys_unshare
-        PTR     sys_splice
-        PTR     sys32_sync_file_range           /* 4305 */
-+       PTR     sys_tee
-+       PTR     sys_vmsplice
-+       PTR     sys_ni_syscall
+diff -Naur linux-2.6.18/arch/mips/kernel/scall64-o32.S linux-2.6.18.mips/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.18/arch/mips/kernel/scall64-o32.S 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/scall64-o32.S    2006-09-20 06:55:21.000000000 -0700
+@@ -514,4 +514,6 @@
+        PTR     sys_tee
+        PTR     sys_vmsplice
+        PTR     compat_sys_move_pages
 +       PTR     compat_sys_set_robust_list
 +       PTR     compat_sys_get_robust_list      /* 4310 */
         .size   sys_call_table,.-sys_call_table
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/signal32.c linux-2.6.17.13/arch/mips/kernel/signal32.c
---- linux-2.6.17.13.orig/arch/mips/kernel/signal32.c    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/signal32.c 2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/arch/mips/kernel/signal32.c linux-2.6.18.mips/arch/mips/kernel/signal32.c
+--- linux-2.6.18/arch/mips/kernel/signal32.c    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/signal32.c       2006-09-20 06:55:21.000000000 -0700
 @@ -815,9 +815,6 @@
         if (!user_mode(regs))
@@ -1153 +1136 @@
  
         /*
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/signal.c linux-2.6.17.13/arch/mips/kernel/signal.c
---- linux-2.6.17.13.orig/arch/mips/kernel/signal.c      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/signal.c   2006-09-09 10:17:04.000000000 -0700
-@@ -425,15 +425,11 @@
+diff -Naur linux-2.6.18/arch/mips/kernel/signal.c linux-2.6.18.mips/arch/mips/kernel/signal.c
+--- linux-2.6.18/arch/mips/kernel/signal.c      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/signal.c 2006-09-20 06:55:21.000000000 -0700
+@@ -424,15 +424,11 @@
         if (!user_mode(regs))
                 return;
@@ -1172 +1155 @@
         if (signr > 0) {
                 /* Whee!  Actually deliver the signal.  */
-@@ -447,9 +443,10 @@
+@@ -446,9 +442,10 @@
                         if (test_thread_flag(TIF_RESTORE_SIGMASK))
                                 clear_thread_flag(TIF_RESTORE_SIGMASK);
@@ -1184 +1167 @@
          * Who's code doesn't conform to the restartable syscall convention
          * dies here!!!  The li instruction, a single machine instruction,
-@@ -467,6 +464,7 @@
+@@ -466,6 +463,7 @@
                         regs->regs[7] = regs->regs[26];
                         regs->cp0_epc -= 4;
@@ -1192 +1175 @@
  
         /*
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/smp.c linux-2.6.17.13/arch/mips/kernel/smp.c
---- linux-2.6.17.13.orig/arch/mips/kernel/smp.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/smp.c      2006-09-09 10:17:04.000000000 -0700
-@@ -336,7 +336,7 @@
-        preempt_disable();
- 
-        if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) {
--               smp_call_function(flush_tlb_mm_ipi, (void *)mm, 1, 1);
-+               __on_other_cores(flush_tlb_mm_ipi, (void *)mm);
-        } else {
-                int i;
-                for (i = 0; i < num_online_cpus(); i++)
-@@ -372,7 +372,7 @@
-                fd.vma = vma;
-                fd.addr1 = start;
-                fd.addr2 = end;
--               smp_call_function(flush_tlb_range_ipi, (void *)&fd, 1, 1);
-+               __on_other_cores(flush_tlb_range_ipi, (void *)&fd);
-        } else {
-                int i;
-                for (i = 0; i < num_online_cpus(); i++)
-@@ -414,7 +414,7 @@
- 
-                fd.vma = vma;
-                fd.addr1 = page;
--               smp_call_function(flush_tlb_page_ipi, (void *)&fd, 1, 1);
-+               __on_other_cores(flush_tlb_page_ipi, (void *)&fd);
-        } else {
-                int i;
-                for (i = 0; i < num_online_cpus(); i++)
-@@ -434,8 +434,7 @@
- 
- void flush_tlb_one(unsigned long vaddr)
+diff -Naur linux-2.6.18/arch/mips/kernel/smp.c linux-2.6.18.mips/arch/mips/kernel/smp.c
+--- linux-2.6.18/arch/mips/kernel/smp.c 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/smp.c    2006-09-20 06:55:21.000000000 -0700
+@@ -467,14 +467,18 @@
+ 
+ static int __init topology_init(void)
  {
--       smp_call_function(flush_tlb_one_ipi, (void *) vaddr, 1, 1);
--       local_flush_tlb_one(vaddr);
-+       __on_each_core(flush_tlb_one_ipi, (void *) vaddr);
- }
- 
- static DEFINE_PER_CPU(struct cpu, cpu_devices);
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/smp-mt.c linux-2.6.17.13/arch/mips/kernel/smp-mt.c
---- linux-2.6.17.13.orig/arch/mips/kernel/smp-mt.c      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/smp-mt.c   2006-09-09 10:17:04.000000000 -0700
+-       int cpu;
+-       int ret;
++       int i, ret;
+ 
+-       for_each_present_cpu(cpu) {
+-               ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu);
++#ifdef CONFIG_NUMA
++       for_each_online_node(i)
++               register_one_node(i);
++#endif /* CONFIG_NUMA */
++
++       for_each_present_cpu(i) {
++               ret = register_cpu(&per_cpu(cpu_devices, i), i);
+                if (ret)
+                        printk(KERN_WARNING "topology_init: register_cpu %d "
+-                              "failed (%d)\n", cpu, ret);
++                              "failed (%d)\n", i, ret);
+        }
+ 
+        return 0;
+diff -Naur linux-2.6.18/arch/mips/kernel/smp-mt.c linux-2.6.18.mips/arch/mips/kernel/smp-mt.c
+--- linux-2.6.18/arch/mips/kernel/smp-mt.c      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/smp-mt.c 2006-09-20 06:55:21.000000000 -0700
 @@ -203,7 +203,7 @@
                                 write_vpe_c0_config( read_c0_config());
@@ -1244 +1214 @@
                                 /* Propagate Config7 */
                                 write_vpe_c0_config7(read_c0_config7());
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/smtc-asm.S linux-2.6.17.13/arch/mips/kernel/smtc-asm.S
---- linux-2.6.17.13.orig/arch/mips/kernel/smtc-asm.S    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/smtc-asm.S 2006-09-09 10:17:04.000000000 -0700
-@@ -52,12 +52,12 @@
-        .set    noat
-        /* Disable thread scheduling to make Status update atomic */
-        DMT     27                                      # dmt   k1
--       ehb
-+       _ehb
-        /* Set EXL */
-        mfc0    k0,CP0_STATUS
-        ori     k0,k0,ST0_EXL
-        mtc0    k0,CP0_STATUS
--       ehb
-+       _ehb
-        /* Thread scheduling now inhibited by EXL. Restore TE state. */
-        andi    k1,k1,VPECONTROL_TE
-        beqz    k1,1f
-@@ -82,7 +82,7 @@
-        li      k1,ST0_CU0
-        or      k1,k1,k0
-        mtc0    k1,CP0_STATUS
--       ehb
-+       _ehb
-        get_saved_sp
-        /* Interrupting TC will have pre-set values in slots in the new frame */
- 2:     subu    k1,k1,PT_SIZE
-@@ -90,7 +90,7 @@
-        lw      k0,PT_TCSTATUS(k1)
-        /* Write it to TCStatus to restore CU/KSU/IXMT state */
-        mtc0    k0,$2,1
--       ehb
-+       _ehb
-        lw      k0,PT_EPC(k1)
-        mtc0    k0,CP0_EPC
-        /* Save all will redundantly recompute the SP, but use it for now */
-@@ -116,7 +116,7 @@
-        mfc0    t0,CP0_TCSTATUS
-        ori     t1,t0,TCSTATUS_IXMT
-        mtc0    t1,CP0_TCSTATUS
--       ehb
-+       _ehb
-        /* We know we're in kernel mode, so prepare stack frame */
-        subu    t1,sp,PT_SIZE
-        sw      ra,PT_EPC(t1)
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/syscall.c linux-2.6.17.13/arch/mips/kernel/syscall.c
---- linux-2.6.17.13.orig/arch/mips/kernel/syscall.c     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/syscall.c  2006-09-09 10:17:04.000000000 -0700
-@@ -117,6 +117,22 @@
+diff -Naur linux-2.6.18/arch/mips/kernel/smtc-asm.S linux-2.6.18.mips/arch/mips/kernel/smtc-asm.S
+--- linux-2.6.18/arch/mips/kernel/smtc-asm.S    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/smtc-asm.S       2006-09-20 06:55:21.000000000 -0700
+@@ -8,7 +8,7 @@
+ #include <asm/regdef.h>
+ #include <asm/asmmacro.h>
+ #include <asm/stackframe.h>
+-#include <asm/stackframe.h>
++#include <asm/irqflags.h>
+ 
+ /*
+  * "Software Interrupt" linkage.
+diff -Naur linux-2.6.18/arch/mips/kernel/syscall.c linux-2.6.18.mips/arch/mips/kernel/syscall.c
+--- linux-2.6.18/arch/mips/kernel/syscall.c     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/syscall.c        2006-09-20 06:55:21.000000000 -0700
+@@ -263,7 +263,7 @@
+        return error;
+ }
+ 
+-void sys_set_thread_area(unsigned long addr)
++asmlinkage int sys_set_thread_area(unsigned long addr)
+ {
+        struct thread_info *ti = task_thread_info(current);
+ 
+@@ -271,6 +271,8 @@
+ 
+        /* If some future MIPS implementation has this register in hardware,
+         * we will need to update it here (and in context switches).  */
++
++       return 0;
+ }
+ 
+ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
+diff -Naur linux-2.6.18/arch/mips/kernel/traps.c linux-2.6.18.mips/arch/mips/kernel/traps.c
+--- linux-2.6.18/arch/mips/kernel/traps.c       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/traps.c  2006-09-20 06:55:21.000000000 -0700
+@@ -20,6 +20,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/kallsyms.h>
+ #include <linux/bootmem.h>
++#include <linux/interrupt.h>
+ 
+ #include <asm/bootinfo.h>
+ #include <asm/branch.h>
+@@ -72,28 +73,68 @@
+ void (*board_ejtag_handler_setup)(void);
+ void (*board_bind_eic_interrupt)(int irq, int regset);
+ 
+-/*
+- * These constant is for searching for possible module text segments.
+- * MODULE_RANGE is a guess of how much space is likely to be vmalloced.
+- */
+-#define MODULE_RANGE (8*1024*1024)
++
++static void show_raw_backtrace(unsigned long reg29)
++{
++       unsigned long *sp = (unsigned long *)reg29;
++       unsigned long addr;
++
++       printk("Call Trace:");
++#ifdef CONFIG_KALLSYMS
++       printk("\n");
++#endif
++       while (!kstack_end(sp)) {
++               addr = *sp++;
++               if (__kernel_text_address(addr))
++                       print_ip_sym(addr);
++       }
++       printk("\n");
++}
++
++#ifdef CONFIG_KALLSYMS
++static int raw_show_trace;
++static int __init set_raw_show_trace(char *str)
++{
++       raw_show_trace = 1;
++       return 1;
++}
++__setup("raw_show_trace", set_raw_show_trace);
++
++extern unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
++                                 unsigned long pc, unsigned long ra);
++
++static void show_backtrace(struct task_struct *task, struct pt_regs *regs)
++{
++       unsigned long sp = regs->regs[29];
++       unsigned long ra = regs->regs[31];
++       unsigned long pc = regs->cp0_epc;
++
++       if (raw_show_trace || !__kernel_text_address(pc)) {
++               show_raw_backtrace(sp);
++               return;
++       }
++       printk("Call Trace:\n");
++       do {
++               print_ip_sym(pc);
++               pc = unwind_stack(task, &sp, pc, ra);
++               ra = 0;
++       } while (pc);
++       printk("\n");
++}
++#else
++#define show_backtrace(task, r) show_raw_backtrace((r)->regs[29]);
++#endif
+ 
+ /*
+  * This routine abuses get_user()/put_user() to reference pointers
+  * with at least a bit of error checking ...
+  */
+-void show_stack(struct task_struct *task, unsigned long *sp)
++static void show_stacktrace(struct task_struct *task, struct pt_regs *regs)
+ {
+        const int field = 2 * sizeof(unsigned long);
+        long stackdata;
+        int i;
+-
+-       if (!sp) {
+-               if (task && task != current)
+-                       sp = (unsigned long *) task->thread.reg29;
+-               else
+-                       sp = (unsigned long *) &sp;
+-       }
++       unsigned long *sp = (unsigned long *)regs->regs[29];
+ 
+        printk("Stack :");
+        i = 0;
+@@ -114,32 +155,48 @@
+                i++;
         }
+        printk("\n");
++       show_backtrace(task, regs);
  }
  
-+int mips_mmap_check(unsigned long addr, unsigned long len,
-+       unsigned long flags)
-+{
-+#ifdef CONFIG_MIPS32_COMPAT
-+       if (current->thread.mflags & MF_32BIT_ADDR) {
-+               if (len > TASK_SIZE32)
-+                       return -EINVAL;
-+               if (flags & MAP_FIXED &&
-+                   (addr >= TASK_SIZE32 || addr + len >= TASK_SIZE32))
-+                       return -EINVAL;
-+       }
-+#endif
-+
-+       return 0;
-+}
-+
- /* common code for old and new mmaps */
- static inline unsigned long
- do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/traps.c linux-2.6.17.13/arch/mips/kernel/traps.c
---- linux-2.6.17.13.orig/arch/mips/kernel/traps.c       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/traps.c    2006-09-09 10:17:04.000000000 -0700
-@@ -1051,7 +1051,7 @@
-        return (void *)old_handler;
+-void show_trace(struct task_struct *task, unsigned long *stack)
++static __always_inline void prepare_frametrace(struct pt_regs *regs)
+ {
+-       const int field = 2 * sizeof(unsigned long);
+-       unsigned long addr;
+-
+-       if (!stack) {
+-               if (task && task != current)
+-                       stack = (unsigned long *) task->thread.reg29;
+-               else
+-                       stack = (unsigned long *) &stack;
+-       }
+-
+-       printk("Call Trace:");
+-#ifdef CONFIG_KALLSYMS
+-       printk("\n");
++       __asm__ __volatile__(
++               ".set push\n\t"
++               ".set noat\n\t"
++#ifdef CONFIG_64BIT
++               "1: dla $1, 1b\n\t"
++               "sd $1, %0\n\t"
++               "sd $29, %1\n\t"
++               "sd $31, %2\n\t"
++#else
++               "1: la $1, 1b\n\t"
++               "sw $1, %0\n\t"
++               "sw $29, %1\n\t"
++               "sw $31, %2\n\t"
+ #endif
+-       while (!kstack_end(stack)) {
+-               addr = *stack++;
+-               if (__kernel_text_address(addr)) {
+-                       printk(" [<%0*lx>] ", field, addr);
+-                       print_symbol("%s\n", addr);
++               ".set pop\n\t"
++               : "=m" (regs->cp0_epc),
++               "=m" (regs->regs[29]), "=m" (regs->regs[31])
++               : : "memory");
++}
++
++void show_stack(struct task_struct *task, unsigned long *sp)
++{
++       struct pt_regs regs;
++       if (sp) {
++               regs.regs[29] = (unsigned long)sp;
++               regs.regs[31] = 0;
++               regs.cp0_epc = 0;
++       } else {
++               if (task && task != current) {
++                       regs.regs[29] = task->thread.reg29;
++                       regs.regs[31] = 0;
++                       regs.cp0_epc = task->thread.reg31;
++               } else {
++                       prepare_frametrace(&regs);
+                }
+        }
+-       printk("\n");
++       show_stacktrace(task, &regs);
  }
  
--#ifdef CONFIG_CPU_MIPSR2
-+#ifdef CONFIG_CPU_MIPSR2_SRS
  /*
-  * MIPSR2 shadow register set allocation
-  * FIXME: SMP...
-@@ -1070,11 +1070,9 @@
- 
- static void mips_srs_init(void)
+@@ -147,9 +204,15 @@
+  */
+ void dump_stack(void)
  {
--#ifdef CONFIG_CPU_MIPSR2_SRS
-        shadow_registers.sr_supported = ((read_c0_srsctl() >> 26) & 0x0f) + 1;
-        printk(KERN_INFO "%d MIPSR2 register sets available\n",
-               shadow_registers.sr_supported);
--#endif
-        shadow_registers.sr_allocated = 1;      /* Set 0 used by kernel */
+-       unsigned long stack;
++       struct pt_regs regs;
+ 
+-       show_trace(current, &stack);
++       /*
++        * Remove any garbage that may be in regs (specially func
++        * addresses) to avoid show_raw_backtrace() to report them
++        */
++       memset(&regs, 0, sizeof(regs));
++       prepare_frametrace(&regs);
++       show_backtrace(current, &regs);
  }
  
-@@ -1199,7 +1197,14 @@
- {
-        return set_vi_srs_handler(n, addr, 0);
+ EXPORT_SYMBOL(dump_stack);
+@@ -268,8 +331,7 @@
+        print_modules();
+        printk("Process %s (pid: %d, threadinfo=%p, task=%p)\n",
+                current->comm, current->pid, current_thread_info(), current);
+-       show_stack(current, (long *) regs->regs[29]);
+-       show_trace(current, (long *) regs->regs[29]);
++       show_stacktrace(current, regs);
+        show_code((unsigned int *) regs->cp0_epc);
+        printk("\n");
  }
--#endif
-+
-+#else
-+
-+static inline void mips_srs_init(void)
-+{
-+}
-+
-+#endif /* CONFIG_CPU_MIPSR2_SRS */
- 
- /*
-  * This is used by native signal handling
-@@ -1389,9 +1394,7 @@
-        else
-                ebase = CAC_BASE;
- 
--#ifdef CONFIG_CPU_MIPSR2
-        mips_srs_init();
--#endif
- 
-        per_cpu_trap_init();
- 
-diff -Naur linux-2.6.17.13.orig/arch/mips/kernel/vpe.c linux-2.6.17.13/arch/mips/kernel/vpe.c
---- linux-2.6.17.13.orig/arch/mips/kernel/vpe.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/kernel/vpe.c      2006-09-09 10:17:04.000000000 -0700
-@@ -769,10 +769,16 @@
+@@ -292,6 +354,16 @@
+        printk("%s[#%d]:\n", str, ++die_counter);
+        show_registers(regs);
+        spin_unlock_irq(&die_lock);
++
++       if (in_interrupt())
++               panic("Fatal exception in interrupt");
++
++       if (panic_on_oops) {
++               printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
++               ssleep(5);
++               panic("Fatal exception");
++       }
++
+        do_exit(SIGSEGV);
+ }
+ 
+diff -Naur linux-2.6.18/arch/mips/kernel/vpe.c linux-2.6.18.mips/arch/mips/kernel/vpe.c
+--- linux-2.6.18/arch/mips/kernel/vpe.c 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/kernel/vpe.c    2006-09-20 06:55:21.000000000 -0700
+@@ -768,10 +768,16 @@
          */
         write_tc_c0_tcbind((read_tc_c0_tcbind() & ~TCBIND_CURVPE) | v->minor);
@@ -1385 +1474 @@
          write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() | VPECONF0_VPA);
  
-diff -Naur linux-2.6.17.13.orig/arch/mips/lib/ashldi3.c linux-2.6.17.13/arch/mips/lib/ashldi3.c
---- linux-2.6.17.13.orig/arch/mips/lib/ashldi3.c        1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/arch/mips/lib/ashldi3.c     2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,29 @@
-+#include <linux/module.h>
-+
-+#include "libgcc.h"
-+
-+long long __ashldi3(long long u, word_type b)
-+{
-+       DWunion uu, w;
-+       word_type bm;
-+
-+       if (b == 0)
-+               return u;
-+
-+       uu.ll = u;
-+       bm = 32 - b;
-+
-+       if (bm <= 0) {
-+               w.s.low = 0;
-+               w.s.high = (unsigned int) uu.s.low << -bm;
-+       } else {
-+               const unsigned int carries = (unsigned int) uu.s.low >> bm;
-+
-+               w.s.low = (unsigned int) uu.s.low << b;
-+               w.s.high = ((unsigned int) uu.s.high << b) | carries;
-+       }
-+
-+       return w.ll;
-+}
-+
-+EXPORT_SYMBOL(__ashldi3);
-diff -Naur linux-2.6.17.13.orig/arch/mips/lib/ashrdi3.c linux-2.6.17.13/arch/mips/lib/ashrdi3.c
---- linux-2.6.17.13.orig/arch/mips/lib/ashrdi3.c        1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/arch/mips/lib/ashrdi3.c     2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,31 @@
-+#include <linux/module.h>
-+
-+#include "libgcc.h"
-+
-+long long __ashrdi3(long long u, word_type b)
-+{
-+       DWunion uu, w;
-+       word_type bm;
-+
-+       if (b == 0)
-+               return u;
-+
-+       uu.ll = u;
-+       bm = 32 - b;
-+
-+       if (bm <= 0) {
-+               /* w.s.high = 1..1 or 0..0 */
-+               w.s.high =
-+                   uu.s.high >> 31;
-+               w.s.low = uu.s.high >> -bm;
-+       } else {
-+               const unsigned int carries = (unsigned int) uu.s.high << bm;
-+
-+               w.s.high = uu.s.high >> b;
-+               w.s.low = ((unsigned int) uu.s.low >> b) | carries;
-+       }
-+
-+       return w.ll;
-+}
-+
-+EXPORT_SYMBOL(__ashrdi3);
-diff -Naur linux-2.6.17.13.orig/arch/mips/lib/iomap.c linux-2.6.17.13/arch/mips/lib/iomap.c
---- linux-2.6.17.13.orig/arch/mips/lib/iomap.c  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/lib/iomap.c       1969-12-31 16:00:00.000000000 -0800
+diff -Naur linux-2.6.18/arch/mips/lib/iomap.c linux-2.6.18.mips/arch/mips/lib/iomap.c
+--- linux-2.6.18/arch/mips/lib/iomap.c  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/lib/iomap.c     1969-12-31 16:00:00.000000000 -0800
 @@ -1,78 +0,0 @@
 -/*
@@ -1535 +1556 @@
 -EXPORT_SYMBOL(pci_iomap);
 -EXPORT_SYMBOL(pci_iounmap);
-diff -Naur linux-2.6.17.13.orig/arch/mips/lib/libgcc.h linux-2.6.17.13/arch/mips/lib/libgcc.h
---- linux-2.6.17.13.orig/arch/mips/lib/libgcc.h 1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/arch/mips/lib/libgcc.h      2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,26 @@
-+#ifndef __ASM_LIBGCC_H
-+#define __ASM_LIBGCC_H
-+
-+#include <asm/byteorder.h>
-+
-+typedef int word_type __attribute__ ((mode (__word__)));
-+
-+#ifdef __BIG_ENDIAN
-+struct DWstruct {
-+       int high, low;
-+};
-+#elif defined(__LITTLE_ENDIAN)
-+struct DWstruct {
-+       int low, high;
-+};
-+#else
-+#error I feel sick.
-+#endif
-+
-+typedef union
-+{
-+       struct DWstruct s;
-+       long long ll;
-+} DWunion;
-+
-+#endif /* __ASM_LIBGCC_H */
-diff -Naur linux-2.6.17.13.orig/arch/mips/lib/lshrdi3.c linux-2.6.17.13/arch/mips/lib/lshrdi3.c
---- linux-2.6.17.13.orig/arch/mips/lib/lshrdi3.c        1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/arch/mips/lib/lshrdi3.c     2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,29 @@
-+#include <linux/module.h>
-+
-+#include "libgcc.h"
-+
-+long long __lshrdi3(long long u, word_type b)
-+{
-+       DWunion uu, w;
-+       word_type bm;
-+
-+       if (b == 0)
-+               return u;
-+
-+       uu.ll = u;
-+       bm = 32 - b;
-+
-+       if (bm <= 0) {
-+               w.s.high = 0;
-+               w.s.low = (unsigned int) uu.s.high >> -bm;
-+       } else {
-+               const unsigned int carries = (unsigned int) uu.s.high << bm;
-+
-+               w.s.high = (unsigned int) uu.s.high >> b;
-+               w.s.low = ((unsigned int) uu.s.low >> b) | carries;
-+       }
-+
-+       return w.ll;
-+}
-+
-+EXPORT_SYMBOL(__lshrdi3);
-diff -Naur linux-2.6.17.13.orig/arch/mips/lib/Makefile linux-2.6.17.13/arch/mips/lib/Makefile
---- linux-2.6.17.13.orig/arch/mips/lib/Makefile 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/lib/Makefile      2006-09-09 10:17:04.000000000 -0700
-@@ -5,6 +5,7 @@
+diff -Naur linux-2.6.18/arch/mips/lib/Makefile linux-2.6.18.mips/arch/mips/lib/Makefile
+--- linux-2.6.18/arch/mips/lib/Makefile 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/lib/Makefile    2006-09-20 06:55:21.000000000 -0700
+@@ -5,8 +5,6 @@
  lib-y  += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
            strnlen_user.o uncached.o
  
 -obj-y  += iomap.o
-+# libgcc-style stuff needed in the kernel
-+lib-y += ashldi3.o ashrdi3.o lshrdi3.o
- 
- EXTRA_AFLAGS := $(CFLAGS)
-diff -Naur linux-2.6.17.13.orig/arch/mips/lib-32/dump_tlb.c linux-2.6.17.13/arch/mips/lib-32/dump_tlb.c
---- linux-2.6.17.13.orig/arch/mips/lib-32/dump_tlb.c    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/lib-32/dump_tlb.c 2006-09-09 10:17:04.000000000 -0700
-@@ -41,8 +41,6 @@
+-
+ # libgcc-style stuff needed in the kernel
+ lib-y += ashldi3.o ashrdi3.o lshrdi3.o
+ 
+diff -Naur linux-2.6.18/arch/mips/lib-32/dump_tlb.c linux-2.6.18.mips/arch/mips/lib-32/dump_tlb.c
+--- linux-2.6.18/arch/mips/lib-32/dump_tlb.c    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/lib-32/dump_tlb.c       2006-09-20 06:55:21.000000000 -0700
+@@ -40,8 +40,6 @@
                 return "256Mb";
  #endif
@@ -1622 +1580 @@
  
  #define BARRIER()                                      \
-diff -Naur linux-2.6.17.13.orig/arch/mips/lib-64/dump_tlb.c linux-2.6.17.13/arch/mips/lib-64/dump_tlb.c
---- linux-2.6.17.13.orig/arch/mips/lib-64/dump_tlb.c    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/lib-64/dump_tlb.c 2006-09-09 10:17:04.000000000 -0700
-@@ -32,8 +32,6 @@
+diff -Naur linux-2.6.18/arch/mips/lib-64/dump_tlb.c linux-2.6.18.mips/arch/mips/lib-64/dump_tlb.c
+--- linux-2.6.18/arch/mips/lib-64/dump_tlb.c    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/lib-64/dump_tlb.c       2006-09-20 06:55:21.000000000 -0700
+@@ -31,8 +31,6 @@
         case PM_256M:   return "256Mb";
  #endif
@@ -1634 +1592 @@
  
  #define BARRIER()                                      \
-diff -Naur linux-2.6.17.13.orig/arch/mips/Makefile linux-2.6.17.13/arch/mips/Makefile
---- linux-2.6.17.13.orig/arch/mips/Makefile     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/Makefile  2006-09-09 10:17:04.000000000 -0700
-@@ -83,6 +83,8 @@
- LDFLAGS_vmlinux                        += -G 0 -static -n -nostdlib
- MODFLAGS                       += -mlong-calls
- 
-+cflags-y += -ffreestanding
-+
+diff -Naur linux-2.6.18/arch/mips/Makefile linux-2.6.18.mips/arch/mips/Makefile
+--- linux-2.6.18/arch/mips/Makefile     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/Makefile        2006-09-20 06:55:21.000000000 -0700
+@@ -330,6 +330,7 @@
+ # MIPS SEAD board
  #
- # We explicitly add the endianness specifier if needed, this allows
- # to compile kernels with a toolchain for the other endianness. We
-@@ -365,6 +367,7 @@
- cflags-$(CONFIG_PMC_YOSEMITE)  += -Iinclude/asm-mips/mach-yosemite
- load-$(CONFIG_PMC_YOSEMITE)    += 0xffffffff80100000
- 
-+#
- # Qemu simulating MIPS32 4Kc
+ core-$(CONFIG_MIPS_SEAD)       += arch/mips/mips-boards/sead/
++cflags-$(CONFIG_MIPS_SEAD)     += -Iinclude/asm-mips/mach-mips
+ load-$(CONFIG_MIPS_SEAD)       += 0xffffffff80100000
+ 
  #
- core-$(CONFIG_QEMU)            += arch/mips/qemu/
-diff -Naur linux-2.6.17.13.orig/arch/mips/mips-boards/generic/memory.c linux-2.6.17.13/arch/mips/mips-boards/generic/memory.c
---- linux-2.6.17.13.orig/arch/mips/mips-boards/generic/memory.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mips-boards/generic/memory.c      2006-09-09 10:17:04.000000000 -0700
-@@ -48,34 +48,45 @@
- };
+diff -Naur linux-2.6.18/arch/mips/mips-boards/atlas/atlas_int.c linux-2.6.18.mips/arch/mips/mips-boards/atlas/atlas_int.c
+--- linux-2.6.18/arch/mips/mips-boards/atlas/atlas_int.c        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mips-boards/atlas/atlas_int.c   2006-09-20 06:55:21.000000000 -0700
+@@ -1,6 +1,8 @@
+ /*
+- * Carsten Langgaard, carstenl@mips.com
+- * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
++ * Copyright (C) 1999, 2000, 2006  MIPS Technologies, Inc.
++ *     All rights reserved.
++ *     Authors: Carsten Langgaard <carstenl@mips.com>
++ *              Maciej W. Rozycki <macro@mips.com>
+  *
+  * ########################################################################
+  *
+@@ -25,17 +27,20 @@
+  */
+ #include <linux/compiler.h>
+ #include <linux/init.h>
++#include <linux/irq.h>
+ #include <linux/sched.h>
+ #include <linux/slab.h>
+ #include <linux/interrupt.h>
+ #include <linux/kernel_stat.h>
+ 
+-#include <asm/irq.h>
++#include <asm/gdb-stub.h>
+ #include <asm/io.h>
++#include <asm/irq_cpu.h>
++#include <asm/msc01_ic.h>
++
+ #include <asm/mips-boards/atlas.h>
+ #include <asm/mips-boards/atlasint.h>
+-#include <asm/gdb-stub.h>
+-
++#include <asm/mips-boards/generic.h>
+ 
+ static struct atlas_ictrl_regs *atlas_hw0_icregs;
+ 
+@@ -47,13 +52,13 @@
+ 
+ void disable_atlas_irq(unsigned int irq_nr)
+ {
+-       atlas_hw0_icregs->intrsten = (1 << (irq_nr-ATLASINT_BASE));
++       atlas_hw0_icregs->intrsten = 1 << (irq_nr - ATLAS_INT_BASE);
+        iob();
+ }
+ 
+ void enable_atlas_irq(unsigned int irq_nr)
+ {
+-       atlas_hw0_icregs->intseten = (1 << (irq_nr-ATLASINT_BASE));
++       atlas_hw0_icregs->intseten = 1 << (irq_nr - ATLAS_INT_BASE);
+        iob();
+ }
+ 
+@@ -107,7 +112,7 @@
+        if (unlikely(int_status == 0))
+                return;
+ 
+-       irq = ATLASINT_BASE + ls1bit32(int_status);
++       irq = ATLAS_INT_BASE + ls1bit32(int_status);
+ 
+        DEBUG_INT("atlas_hw0_irqdispatch: irq=%d\n", irq);
+ 
+@@ -161,15 +166,14 @@
+ }
+ 
+ /*
+- * IRQs on the Atlas board look basically (barring software IRQs which we
+- * don't use at all and all external interrupt sources are combined together
+- * on hardware interrupt 0 (MIPS IRQ 2)) like:
++ * IRQs on the Atlas board look basically like (all external interrupt
++ * sources are combined together on hardware interrupt 0 (MIPS IRQ 2)):
+  *
+- *     MIPS IRQ        Source
++ *      MIPS IRQ        Source
+  *      --------        ------
+- *             0       Software (ignored)
+- *             1        Software (ignored)
+- *             2        Combined hardware interrupt (hw0)
++ *             0        Software 0 (reschedule IPI on MT)
++ *             1        Software 1 (remote call IPI on MT)
++ *             2        Combined Atlas hardware interrupt (hw0)
+  *             3        Hardware (ignored)
+  *             4        Hardware (ignored)
+  *             5        Hardware (ignored)
+@@ -179,7 +183,7 @@
+  * We handle the IRQ according to _our_ priority which is:
+  *
+  * Highest ----     R4k Timer
+- * Lowest  ----     Combined hardware interrupt
++ * Lowest  ----     Software 0
+  *
+  * then we just return, if multiple IRQs are pending then we will just take
+  * another exception, big deal.
+@@ -193,17 +197,19 @@
+ 
+        if (irq == MIPSCPU_INT_ATLAS)
+                atlas_hw0_irqdispatch(regs);
+-       else if (irq > 0)
++       else if (irq >= 0)
+                do_IRQ(MIPSCPU_INT_BASE + irq, regs);
+        else
+                spurious_interrupt(regs);
+ }
+ 
+-void __init arch_init_irq(void)
++static inline void init_atlas_irqs (int base)
+ {
+        int i;
+ 
+-       atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *));
++       atlas_hw0_icregs = (struct atlas_ictrl_regs *)
++                          ioremap(ATLAS_ICTRL_REGS_BASE,
++                                  sizeof(struct atlas_ictrl_regs *));
+ 
+        /*
+         * Mask out all interrupt by writing "1" to all bit position in
+@@ -211,7 +217,7 @@
+         */
+        atlas_hw0_icregs->intrsten = 0xffffffff;
+ 
+-       for (i = ATLASINT_BASE; i <= ATLASINT_END; i++) {
++       for (i = ATLAS_INT_BASE; i <= ATLAS_INT_END; i++) {
+                irq_desc[i].status      = IRQ_DISABLED;
+                irq_desc[i].action      = 0;
+                irq_desc[i].depth       = 1;
+@@ -219,3 +225,62 @@
+                spin_lock_init(&irq_desc[i].lock);
+        }
+ }
++
++static struct irqaction atlasirq = {
++       .handler = no_action,
++       .name = "Atlas cascade"
++};
++
++msc_irqmap_t __initdata msc_irqmap[] = {
++       {MSC01C_INT_TMR,                MSC01_IRQ_EDGE, 0},
++       {MSC01C_INT_PCI,                MSC01_IRQ_LEVEL, 0},
++};
++int __initdata msc_nr_irqs = sizeof(msc_irqmap) / sizeof(*msc_irqmap);
++
++msc_irqmap_t __initdata msc_eicirqmap[] = {
++       {MSC01E_INT_SW0,                MSC01_IRQ_LEVEL, 0},
++       {MSC01E_INT_SW1,                MSC01_IRQ_LEVEL, 0},
++       {MSC01E_INT_ATLAS,              MSC01_IRQ_LEVEL, 0},
++       {MSC01E_INT_TMR,                MSC01_IRQ_EDGE, 0},
++       {MSC01E_INT_PCI,                MSC01_IRQ_LEVEL, 0},
++       {MSC01E_INT_PERFCTR,            MSC01_IRQ_LEVEL, 0},
++       {MSC01E_INT_CPUCTR,             MSC01_IRQ_LEVEL, 0}
++};
++int __initdata msc_nr_eicirqs = sizeof(msc_eicirqmap) / sizeof(*msc_eicirqmap);
++
++void __init arch_init_irq(void)
++{
++       init_atlas_irqs(ATLAS_INT_BASE);
++
++       if (!cpu_has_veic)
++               mips_cpu_irq_init(MIPSCPU_INT_BASE);
++
++       switch(mips_revision_corid) {
++       case MIPS_REVISION_CORID_CORE_MSC:
++       case MIPS_REVISION_CORID_CORE_FPGA2:
++       case MIPS_REVISION_CORID_CORE_FPGA3:
++       case MIPS_REVISION_CORID_CORE_24K:
++       case MIPS_REVISION_CORID_CORE_EMUL_MSC:
++               if (cpu_has_veic)
++                       init_msc_irqs (MSC01E_INT_BASE,
++                                      msc_eicirqmap, msc_nr_eicirqs);
++               else
++                       init_msc_irqs (MSC01C_INT_BASE,
++                                      msc_irqmap, msc_nr_irqs);
++       }
++
++
++       if (cpu_has_veic) {
++               set_vi_handler (MSC01E_INT_ATLAS, atlas_hw0_irqdispatch);
++               setup_irq (MSC01E_INT_BASE + MSC01E_INT_ATLAS, &atlasirq);
++       } else if (cpu_has_vint) {
++               set_vi_handler (MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch);
++#ifdef CONFIG_MIPS_MT_SMTC
++               setup_irq_smtc (MIPSCPU_INT_BASE + MIPSCPU_INT_ATLAS,
++                               &atlasirq, (0x100 << MIPSCPU_INT_ATLAS));
++#else /* Not SMTC */
++               setup_irq(MIPSCPU_INT_BASE + MIPSCPU_INT_ATLAS, &atlasirq);
++#endif /* CONFIG_MIPS_MT_SMTC */
++       } else
++               setup_irq(MIPSCPU_INT_BASE + MIPSCPU_INT_ATLAS, &atlasirq);
++}
+diff -Naur linux-2.6.18/arch/mips/mips-boards/atlas/atlas_setup.c linux-2.6.18.mips/arch/mips/mips-boards/atlas/atlas_setup.c
+--- linux-2.6.18/arch/mips/mips-boards/atlas/atlas_setup.c      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mips-boards/atlas/atlas_setup.c 2006-09-20 06:55:21.000000000 -0700
+@@ -77,7 +77,7 @@
+ #else
+        s.iobase = ATLAS_UART_REGS_BASE+3;
  #endif
- 
-+/* determined physical memory size, not overridden by command line args  */
-+unsigned long physical_memsize = 0L;
-+
- struct prom_pmemblock * __init prom_getmdesc(void)
+-       s.irq = ATLASINT_UART;
++       s.irq = ATLAS_INT_UART;
+        s.uartclk = ATLAS_BASE_BAUD * 16;
+        s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;
+        s.iotype = UPIO_PORT;
+diff -Naur linux-2.6.18/arch/mips/mips-boards/generic/time.c linux-2.6.18.mips/arch/mips/mips-boards/generic/time.c
+--- linux-2.6.18/arch/mips/mips-boards/generic/time.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mips-boards/generic/time.c      2006-09-20 06:55:21.000000000 -0700
+@@ -41,8 +41,13 @@
+ 
+ #include <asm/mips-boards/generic.h>
+ #include <asm/mips-boards/prom.h>
++
++#ifdef CONFIG_MIPS_ATLAS
++#include <asm/mips-boards/atlasint.h>
++#endif
++#ifdef CONFIG_MIPS_MALTA
+ #include <asm/mips-boards/maltaint.h>
+-#include <asm/mc146818-time.h>
++#endif
+ 
+ unsigned long cpu_khz;
+ 
+@@ -92,10 +97,9 @@
+ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
  {
-        char *memsize_str;
-        unsigned int memsize;
-        char cmdline[CL_SIZE], *ptr;
- 
--       /* Check the command line first for a memsize directive */
-+       /* otherwise look in the environment */
-+       memsize_str = prom_getenv("memsize");
-+       if (!memsize_str) {
-+               prom_printf("memsize not set in boot prom, set to default (32Mb)\n");
-+               physical_memsize = 0x02000000;
-+       } else {
-+#ifdef DEBUG
-+               prom_printf("prom_memsize = %s\n", memsize_str);
-+#endif
-+               physical_memsize = simple_strtol(memsize_str, NULL, 0);
-+       }
-+
-+#ifdef CONFIG_CPU_BIG_ENDIAN
-+       /* SOC-it swaps, or perhaps doesn't swap, when DMA'ing the last
-+          word of physical memory */
-+       physical_memsize -= PAGE_SIZE;
-+#endif
-+
-+       /* Check the command line for a memsize directive that overrides
-+          the physical/default amount */
-        strcpy(cmdline, arcs_cmdline);
-        ptr = strstr(cmdline, "memsize=");
-        if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
-                ptr = strstr(ptr, " memsize=");
- 
--       if (ptr) {
-+       if (ptr)
-                memsize = memparse(ptr + 8, &ptr);
--       }
--       else {
--               /* otherwise look in the environment */
--               memsize_str = prom_getenv("memsize");
--               if (!memsize_str) {
--                       prom_printf("memsize not set in boot prom, set to default (32Mb)\n");
--                       memsize = 0x02000000;
--               } else {
--#ifdef DEBUG
--                       prom_printf("prom_memsize = %s\n", memsize_str);
--#endif
--                       memsize = simple_strtol(memsize_str, NULL, 0);
--               }
--       }
-+       else
-+               memsize = physical_memsize;
-+
-        memset(mdesc, 0, sizeof(mdesc));
- 
-        mdesc[0].type = yamon_dontuse;
-diff -Naur linux-2.6.17.13.orig/arch/mips/mips-boards/malta/malta_int.c linux-2.6.17.13/arch/mips/mips-boards/malta/malta_int.c
---- linux-2.6.17.13.orig/arch/mips/mips-boards/malta/malta_int.c        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mips-boards/malta/malta_int.c     2006-09-09 10:17:04.000000000 -0700
+        int cpu = smp_processor_id();
+-       int r2 = cpu_has_mips_r2;
+ 
+ #ifdef CONFIG_MIPS_MT_SMTC
+-        /*
++       /*
+         *  In an SMTC system, one Count/Compare set exists per VPE.
+         *  Which TC within a VPE gets the interrupt is essentially
+         *  random - we only know that it shouldn't be one with
+@@ -108,29 +112,46 @@
+         *  the general MIPS timer_interrupt routine.
+         */
+ 
++       int vpflags;
++
+        /*
+-        * DVPE is necessary so long as cross-VPE interrupts
+-        * are done via read-modify-write of Cause register.
++        * We could be here due to timer interrupt,
++        * perf counter overflow, or both.
+         */
+-       int vpflags = dvpe();
+-       write_c0_compare (read_c0_count() - 1);
+-       clear_c0_cause(CPUCTR_IMASKBIT);
+-       evpe(vpflags);
+-
+-       if (cpu_data[cpu].vpe_id == 0) {
+-               timer_interrupt(irq, dev_id, regs);
+-               scroll_display_message();
+-       } else
+-               write_c0_compare (read_c0_count() + ( mips_hpt_frequency/HZ));
+-       smtc_timer_broadcast(cpu_data[cpu].vpe_id);
++       if (read_c0_cause() & (1 << 26))
++               perf_irq(regs);
+ 
+-       if (cpu != 0)
++       if (read_c0_cause() & (1 << 30)) {
++               /* If timer interrupt, make it de-assert */
++               write_c0_compare (read_c0_count() - 1);
+                /*
+-                * Other CPUs should do profiling and process accounting
++                * DVPE is necessary so long as cross-VPE interrupts
++                * are done via read-modify-write of Cause register.
+                 */
+-               local_timer_interrupt(irq, dev_id, regs);
+-
++               vpflags = dvpe();
++               clear_c0_cause(CPUCTR_IMASKBIT);
++               evpe(vpflags);
++               /*
++                * There are things we only want to do once per tick
++                * in an "MP" system.   One TC of each VPE will take
++                * the actual timer interrupt.  The others will get
++                * timer broadcast IPIs. We use whoever it is that takes
++                * the tick on VPE 0 to run the full timer_interrupt().
++                */
++               if (cpu_data[cpu].vpe_id == 0) {
++                               timer_interrupt(irq, NULL, regs);
++                               smtc_timer_broadcast(cpu_data[cpu].vpe_id);
++                               scroll_display_message();
++               } else {
++                       write_c0_compare(read_c0_count() +
++                                        (mips_hpt_frequency/HZ));
++                       local_timer_interrupt(irq, dev_id, regs);
++                       smtc_timer_broadcast(cpu_data[cpu].vpe_id);
++               }
++       }
+ #else /* CONFIG_MIPS_MT_SMTC */
++       int r2 = cpu_has_mips_r2;
++
+        if (cpu == 0) {
+                /*
+                 * CPU 0 handles the global timer interrupt job and process
+@@ -161,9 +182,8 @@
+                 */
+                local_timer_interrupt(irq, dev_id, regs);
+        }
+-#endif /* CONFIG_MIPS_MT_SMTC */
+-
+ out:
++#endif /* CONFIG_MIPS_MT_SMTC */
+        return IRQ_HANDLED;
+ }
+ 
+diff -Naur linux-2.6.18/arch/mips/mips-boards/malta/malta_int.c linux-2.6.18.mips/arch/mips/mips-boards/malta/malta_int.c
+--- linux-2.6.18/arch/mips/mips-boards/malta/malta_int.c        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mips-boards/malta/malta_int.c   2006-09-20 06:55:21.000000000 -0700
 @@ -208,23 +208,23 @@
         unsigned int a0 = 7;
@@ -1752 +1942 @@
         return a0;
  #endif
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/cache.c linux-2.6.17.13/arch/mips/mm/cache.c
---- linux-2.6.17.13.orig/arch/mips/mm/cache.c   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/cache.c        2006-09-09 10:17:04.000000000 -0700
-@@ -26,7 +26,7 @@
+diff -Naur linux-2.6.18/arch/mips/mm/cache.c linux-2.6.18.mips/arch/mips/mm/cache.c
+--- linux-2.6.18/arch/mips/mm/cache.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/cache.c      2006-09-20 06:55:21.000000000 -0700
+@@ -25,7 +25,7 @@
  void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page,
         unsigned long pfn);
@@ -1764 +1954 @@
  /* MIPS specific cache operations */
  void (*flush_cache_sigtramp)(unsigned long addr);
-@@ -71,6 +71,8 @@
+@@ -70,6 +70,8 @@
         struct address_space *mapping = page_mapping(page);
         unsigned long addr;
@@ -1773 +1963 @@
                 SetPageDcacheDirty(page);
                 return;
-@@ -92,16 +94,16 @@
+@@ -91,16 +93,16 @@
  {
         struct page *page;
@@ -1797 +1987 @@
         }
  }
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/c-r3k.c linux-2.6.17.13/arch/mips/mm/c-r3k.c
---- linux-2.6.17.13.orig/arch/mips/mm/c-r3k.c   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/c-r3k.c        2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/arch/mips/mm/c-r3k.c linux-2.6.18.mips/arch/mips/mm/c-r3k.c
+--- linux-2.6.18/arch/mips/mm/c-r3k.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/c-r3k.c      2006-09-20 06:55:21.000000000 -0700
 @@ -335,7 +335,7 @@
         flush_cache_mm = r3k_flush_cache_mm;
@@ -1809 +1999 @@
  
         flush_cache_sigtramp = r3k_flush_cache_sigtramp;
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/c-r4k.c linux-2.6.17.13/arch/mips/mm/c-r4k.c
---- linux-2.6.17.13.orig/arch/mips/mm/c-r4k.c   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/c-r4k.c        2006-09-09 10:17:04.000000000 -0700
-@@ -24,32 +24,12 @@
- #include <asm/page.h>
- #include <asm/pgtable.h>
- #include <asm/r4kcache.h>
-+#include <asm/smp.h>
- #include <asm/system.h>
- #include <asm/mmu_context.h>
- #include <asm/war.h>
- #include <asm/cacheflush.h> /* for run_uncached() */
- 
--
--/*
-- * Special Variant of smp_call_function for use by cache functions:
-- *
-- *  o No return value
-- *  o collapses to normal function call on UP kernels
-- *  o collapses to normal function call on systems with a single shared
-- *    primary cache.
-- */
--static inline void r4k_on_each_cpu(void (*func) (void *info), void *info,
--                                   int retry, int wait)
--{
--       preempt_disable();
--
--#if !defined(CONFIG_MIPS_MT_SMP) && !defined(CONFIG_MIPS_MT_SMTC)
--       smp_call_function(func, info, retry, wait);
--#endif
--       func(info);
--       preempt_enable();
--}
--
- /*
-  * Must die.
-  */
-@@ -60,13 +40,13 @@
- /*
-  * Dummy cache handling routines for machines without boardcaches
-  */
--static void no_sc_noop(void) {}
-+static void cache_noop(void) {}
- 
- static struct bcache_ops no_sc_ops = {
--       .bc_enable = (void *)no_sc_noop,
--       .bc_disable = (void *)no_sc_noop,
--       .bc_wback_inv = (void *)no_sc_noop,
--       .bc_inv = (void *)no_sc_noop
-+       .bc_enable = (void *)cache_noop,
-+       .bc_disable = (void *)cache_noop,
-+       .bc_wback_inv = (void *)cache_noop,
-+       .bc_inv = (void *)cache_noop
- };
- 
- struct bcache_ops *bcops = &no_sc_ops;
-@@ -94,7 +74,9 @@
- {
-        unsigned long  dc_lsize = cpu_dcache_line_size();
- 
--       if (dc_lsize == 16)
-+       if (dc_lsize == 0)
-+               r4k_blast_dcache_page = (void *)cache_noop;
-+       else if (dc_lsize == 16)
-                r4k_blast_dcache_page = blast_dcache16_page;
-        else if (dc_lsize == 32)
-                r4k_blast_dcache_page = r4k_blast_dcache_page_dc32;
-@@ -106,7 +88,9 @@
- {
-        unsigned long dc_lsize = cpu_dcache_line_size();
- 
--       if (dc_lsize == 16)
-+       if (dc_lsize == 0)
-+               r4k_blast_dcache_page_indexed = (void *)cache_noop;
-+       else if (dc_lsize == 16)
-                r4k_blast_dcache_page_indexed = blast_dcache16_page_indexed;
-        else if (dc_lsize == 32)
-                r4k_blast_dcache_page_indexed = blast_dcache32_page_indexed;
-@@ -118,7 +102,9 @@
- {
-        unsigned long dc_lsize = cpu_dcache_line_size();
- 
--       if (dc_lsize == 16)
-+       if (dc_lsize == 0)
-+               r4k_blast_dcache = (void *)cache_noop;
-+       else if (dc_lsize == 16)
-                r4k_blast_dcache = blast_dcache16;
-        else if (dc_lsize == 32)
-                r4k_blast_dcache = blast_dcache32;
-@@ -201,7 +187,9 @@
- {
-        unsigned long ic_lsize = cpu_icache_line_size();
- 
--       if (ic_lsize == 16)
-+       if (ic_lsize == 0)
-+               r4k_blast_icache_page = (void *)cache_noop;
-+       else if (ic_lsize == 16)
-                r4k_blast_icache_page = blast_icache16_page;
-        else if (ic_lsize == 32)
-                r4k_blast_icache_page = blast_icache32_page;
-@@ -216,7 +204,9 @@
- {
-        unsigned long ic_lsize = cpu_icache_line_size();
- 
--       if (ic_lsize == 16)
-+       if (ic_lsize == 0)
-+               r4k_blast_icache_page_indexed = (void *)cache_noop;
-+       else if (ic_lsize == 16)
-                r4k_blast_icache_page_indexed = blast_icache16_page_indexed;
-        else if (ic_lsize == 32) {
-                if (R4600_V1_INDEX_ICACHEOP_WAR && cpu_is_r4600_v1_x())
-@@ -238,7 +228,9 @@
- {
-        unsigned long ic_lsize = cpu_icache_line_size();
- 
--       if (ic_lsize == 16)
-+       if (ic_lsize == 0)
-+               r4k_blast_icache = (void *)cache_noop;
-+       else if (ic_lsize == 16)
-                r4k_blast_icache = blast_icache16;
-        else if (ic_lsize == 32) {
-                if (R4600_V1_INDEX_ICACHEOP_WAR && cpu_is_r4600_v1_x())
-@@ -258,7 +250,7 @@
-        unsigned long sc_lsize = cpu_scache_line_size();
- 
-        if (scache_size == 0)
--               r4k_blast_scache_page = (void *)no_sc_noop;
-+               r4k_blast_scache_page = (void *)cache_noop;
-        else if (sc_lsize == 16)
-                r4k_blast_scache_page = blast_scache16_page;
-        else if (sc_lsize == 32)
-@@ -276,7 +268,7 @@
-        unsigned long sc_lsize = cpu_scache_line_size();
- 
-        if (scache_size == 0)
--               r4k_blast_scache_page_indexed = (void *)no_sc_noop;
-+               r4k_blast_scache_page_indexed = (void *)cache_noop;
-        else if (sc_lsize == 16)
-                r4k_blast_scache_page_indexed = blast_scache16_page_indexed;
-        else if (sc_lsize == 32)
-@@ -294,7 +286,7 @@
-        unsigned long sc_lsize = cpu_scache_line_size();
- 
-        if (scache_size == 0)
--               r4k_blast_scache = (void *)no_sc_noop;
-+               r4k_blast_scache = (void *)cache_noop;
-        else if (sc_lsize == 16)
-                r4k_blast_scache = blast_scache16;
-        else if (sc_lsize == 32)
-@@ -320,7 +312,7 @@
-        if (!cpu_has_dc_aliases)
-                return;
- 
--       r4k_on_each_cpu(local_r4k_flush_cache_all, NULL, 1, 1);
-+       __on_each_core(local_r4k_flush_cache_all, NULL);
- }
- 
- static inline void local_r4k___flush_cache_all(void * args)
-@@ -342,7 +334,7 @@
- 
- static void r4k___flush_cache_all(void)
- {
--       r4k_on_each_cpu(local_r4k___flush_cache_all, NULL, 1, 1);
-+       __on_each_core(local_r4k___flush_cache_all, NULL);
- }
- 
- static inline void local_r4k_flush_cache_range(void * args)
-@@ -363,7 +355,7 @@
- static void r4k_flush_cache_range(struct vm_area_struct *vma,
-        unsigned long start, unsigned long end)
- {
--       r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1, 1);
-+       __on_each_core(local_r4k_flush_cache_range, vma);
- }
- 
- static inline void local_r4k_flush_cache_mm(void * args)
-@@ -392,7 +384,7 @@
-        if (!cpu_has_dc_aliases)
-                return;
- 
--       r4k_on_each_cpu(local_r4k_flush_cache_mm, mm, 1, 1);
-+       __on_each_core(local_r4k_flush_cache_mm, mm);
- }
- 
- struct flush_cache_page_args {
-@@ -464,7 +456,7 @@
+diff -Naur linux-2.6.18/arch/mips/mm/c-r4k.c linux-2.6.18.mips/arch/mips/mm/c-r4k.c
+--- linux-2.6.18/arch/mips/mm/c-r4k.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/c-r4k.c      2006-09-20 06:55:21.000000000 -0700
+@@ -475,7 +475,7 @@
                 }
         }
@@ -2003 +2011 @@
  
                         if (cpu_context(cpu, mm) != 0)
-@@ -483,7 +475,7 @@
-        args.addr = addr;
-        args.pfn = pfn;
- 
--       r4k_on_each_cpu(local_r4k_flush_cache_page, &args, 1, 1);
-+       __on_each_core(local_r4k_flush_cache_page, &args);
- }
- 
- static inline void local_r4k_flush_data_cache_page(void * addr)
-@@ -493,7 +485,7 @@
- 
- static void r4k_flush_data_cache_page(unsigned long addr)
- {
--       r4k_on_each_cpu(local_r4k_flush_data_cache_page, (void *) addr, 1, 1);
-+       __on_each_core(local_r4k_flush_data_cache_page, (void *) addr);
- }
- 
- struct flush_icache_range_args {
-@@ -508,7 +500,7 @@
-        unsigned long end = fir_args->end;
- 
-        if (!cpu_has_ic_fills_f_dc) {
--               if (end - start > dcache_size) {
-+               if (end - start >= dcache_size) {
-                        r4k_blast_dcache();
-                } else {
-                        R4600_HIT_CACHEOP_WAR_IMPL;
-@@ -536,7 +528,7 @@
-        args.start = start;
-        args.end = end;
- 
--       r4k_on_each_cpu(local_r4k_flush_icache_range, &args, 1, 1);
-+       __on_each_core(local_r4k_flush_icache_range, &args);
-        instruction_hazard();
- }
- 
-@@ -588,7 +580,7 @@
+@@ -599,7 +599,7 @@
          * We're not sure of the virtual address(es) involved here, so
          * we have to flush the entire I-cache.
@@ -2048 +2020 @@
  
                 if (cpu_context(cpu, vma->vm_mm) != 0)
-@@ -612,7 +604,7 @@
-        args.vma = vma;
-        args.page = page;
- 
--       r4k_on_each_cpu(local_r4k_flush_icache_page, &args, 1, 1);
-+       __on_each_core(local_r4k_flush_icache_page, &args);
- }
- 
- 
-@@ -683,10 +675,12 @@
-        unsigned long addr = (unsigned long) arg;
- 
-        R4600_HIT_CACHEOP_WAR_IMPL;
--       protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
-+       if (dc_lsize)
-+               protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
-        if (!cpu_icache_snoops_remote_store && scache_size)
-                protected_writeback_scache_line(addr & ~(sc_lsize - 1));
--       protected_flush_icache_line(addr & ~(ic_lsize - 1));
-+       if (ic_lsize)
-+               protected_flush_icache_line(addr & ~(ic_lsize - 1));
-        if (MIPS4K_ICACHE_REFILL_WAR) {
-                __asm__ __volatile__ (
-                        ".set push\n\t"
-@@ -711,7 +705,7 @@
- 
- static void r4k_flush_cache_sigtramp(unsigned long addr)
- {
--       r4k_on_each_cpu(local_r4k_flush_cache_sigtramp, (void *) addr, 1, 1);
-+       __on_each_core(local_r4k_flush_cache_sigtramp, (void *) addr);
- }
- 
- static void r4k_flush_icache_all(void)
-@@ -973,8 +967,10 @@
-        c->icache.waysize = icache_size / c->icache.ways;
-        c->dcache.waysize = dcache_size / c->dcache.ways;
- 
--       c->icache.sets = icache_size / (c->icache.linesz * c->icache.ways);
--       c->dcache.sets = dcache_size / (c->dcache.linesz * c->dcache.ways);
-+       c->icache.sets = c->icache.linesz ?
-+               icache_size / (c->icache.linesz * c->icache.ways) : 0;
-+       c->dcache.sets = c->dcache.linesz ?
-+               dcache_size / (c->dcache.linesz * c->dcache.ways) : 0;
- 
+@@ -1242,7 +1242,7 @@
+                clear_c0_config(CONF_CU);
+                break;
         /*
-         * R10000 and R12000 P-caches are odd in a positive way.  They're 32kB
-@@ -993,10 +989,15 @@
-                break;
-        case CPU_24K:
-        case CPU_34K:
--               if (!(read_c0_config7() & (1 << 16)))
-+               if ((read_c0_config7() & (1 << 16))) {
-+                       /* effectively physically indexed dcache,
-+                          thus no virtual aliases. */
-+                       c->dcache.flags |= MIPS_CACHE_PINDEX;
-+                       break;
-+               }
-        default:
--                       if (c->dcache.waysize > PAGE_SIZE)
--                               c->dcache.flags |= MIPS_CACHE_ALIASES;
-+               if (c->dcache.waysize > PAGE_SIZE)
-+                       c->dcache.flags |= MIPS_CACHE_ALIASES;
-        }
- 
-        switch (c->cputype) {
-@@ -1092,6 +1093,7 @@
- 
- extern int r5k_sc_init(void);
- extern int rm7k_sc_init(void);
-+extern int mips_sc_init(void);
- 
- static void __init setup_scache(void)
- {
-@@ -1139,17 +1141,29 @@
-                return;
- 
-        default:
-+               if (c->isa_level == MIPS_CPU_ISA_M32R1 ||
-+                   c->isa_level == MIPS_CPU_ISA_M32R2 ||
-+                   c->isa_level == MIPS_CPU_ISA_M64R1 ||
-+                   c->isa_level == MIPS_CPU_ISA_M64R2) {
-+#ifdef CONFIG_MIPS_CPU_SCACHE
-+                       if (mips_sc_init ()) {
-+                               scache_size = c->scache.ways * c->scache.sets * c->scache.linesz;
-+                               printk("MIPS secondary cache %ldkB, %s, linesize %d bytes.\n",
-+                                      scache_size >> 10,
-+                                      way_string[c->scache.ways], c->scache.linesz);
-+                       }
-+#else
-+                       if (!(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
-+                               panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
-+#endif
-+                       return;
-+               }
-                sc_present = 0;
-        }
- 
-        if (!sc_present)
-                return;
- 
--       if ((c->isa_level == MIPS_CPU_ISA_M32R1 ||
--            c->isa_level == MIPS_CPU_ISA_M64R1) &&
--           !(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
--               panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
--
-        /* compute a couple of other cache variables */
-        c->scache.waysize = scache_size / c->scache.ways;
- 
-@@ -1246,15 +1260,17 @@
-         * This code supports virtually indexed processors and will be
-         * unnecessarily inefficient on physically indexed processors.
+-        * We need to catch the ealry Alchemy SOCs with
++        * We need to catch the early Alchemy SOCs with
+         * the write-only co_config.od bit and set it back to one...
          */
--       shm_align_mask = max_t( unsigned long,
--                               c->dcache.sets * c->dcache.linesz - 1,
--                               PAGE_SIZE - 1);
--
-+       if (c->dcache.linesz)
-+               shm_align_mask = max_t( unsigned long,
-+                                       c->dcache.sets * c->dcache.linesz - 1,
-+                                       PAGE_SIZE - 1);
-+       else
-+               shm_align_mask = PAGE_SIZE-1;
-        flush_cache_all         = r4k_flush_cache_all;
+        case CPU_AU1000: /* rev. DA, HA, HB */
+@@ -1291,7 +1291,7 @@
         __flush_cache_all       = r4k___flush_cache_all;
         flush_cache_mm          = r4k_flush_cache_mm;
@@ -2179 +2038 @@
  
         flush_cache_sigtramp    = r4k_flush_cache_sigtramp;
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/c-sb1.c linux-2.6.17.13/arch/mips/mm/c-sb1.c
---- linux-2.6.17.13.orig/arch/mips/mm/c-sb1.c   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/c-sb1.c        2006-09-09 10:17:04.000000000 -0700
-@@ -156,6 +156,26 @@
+diff -Naur linux-2.6.18/arch/mips/mm/c-sb1.c linux-2.6.18.mips/arch/mips/mm/c-sb1.c
+--- linux-2.6.18/arch/mips/mm/c-sb1.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/c-sb1.c      2006-09-20 06:55:21.000000000 -0700
+@@ -155,6 +155,26 @@
  }
  
@@ -2209 +2068 @@
   * dcache first, then invalidate the icache.  If the page isn't
   * executable, nothing is required.
-@@ -174,8 +194,11 @@
+@@ -173,8 +193,11 @@
         /*
          * Bumping the ASID is probably cheaper than the flush ...
@@ -2223 +2082 @@
  
  #ifdef CONFIG_SMP
-@@ -211,26 +234,6 @@
+@@ -210,26 +233,6 @@
         __attribute__((alias("local_sb1_flush_cache_page")));
  #endif
@@ -2250 +2109 @@
  /*
   * Invalidate all caches on this CPU
-@@ -327,9 +330,12 @@
+@@ -326,9 +329,12 @@
          * If there's a context, bump the ASID (cheaper than a flush,
          * since we don't know VAs!)
@@ -2266 +2125 @@
  
  #ifdef CONFIG_SMP
-@@ -521,7 +527,7 @@
+@@ -520,7 +526,7 @@
  
         /* These routines are for Icache coherence with the Dcache */
@@ -2275 +2134 @@
  
         /* This implies an Icache flush too, so can't be nop'ed */
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/c-tx39.c linux-2.6.17.13/arch/mips/mm/c-tx39.c
---- linux-2.6.17.13.orig/arch/mips/mm/c-tx39.c  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/c-tx39.c       2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/arch/mips/mm/c-tx39.c linux-2.6.18.mips/arch/mips/mm/c-tx39.c
+--- linux-2.6.18/arch/mips/mm/c-tx39.c  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/c-tx39.c     2006-09-20 06:55:21.000000000 -0700
 @@ -382,7 +382,7 @@
                 flush_cache_mm          = (void *) tx39h_flush_icache_all;
@@ -2296 +2155 @@
  
                 flush_cache_sigtramp = tx39_flush_cache_sigtramp;
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/init.c linux-2.6.17.13/arch/mips/mm/init.c
---- linux-2.6.17.13.orig/arch/mips/mm/init.c    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/init.c 2006-09-09 10:17:04.000000000 -0700
-@@ -31,11 +31,39 @@
+diff -Naur linux-2.6.18/arch/mips/mm/fault.c linux-2.6.18.mips/arch/mips/mm/fault.c
+--- linux-2.6.18/arch/mips/mm/fault.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/fault.c      2006-09-20 06:55:21.000000000 -0700
+@@ -89,7 +89,7 @@
+                if (!(vma->vm_flags & VM_WRITE))
+                        goto bad_area;
+        } else {
+-               if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
++               if (!(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)))
+                        goto bad_area;
+        }
+ 
+diff -Naur linux-2.6.18/arch/mips/mm/init.c linux-2.6.18.mips/arch/mips/mm/init.c
+--- linux-2.6.18/arch/mips/mm/init.c    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/init.c       2006-09-20 06:55:21.000000000 -0700
+@@ -30,11 +30,39 @@
  #include <asm/cachectl.h>
  #include <asm/cpu.h>
@@ -2339 +2210 @@
  DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
  
-@@ -81,13 +109,183 @@
+@@ -80,13 +108,184 @@
         return 1UL << order;
  }
@@ -2374 +2245 @@
 +       unsigned long old_ctx;
 +       pte_t pte;
-+       unsigned int tlbidx;
++       int tlbidx;
 +
 +       inc_preempt_count();
@@ -2438 +2309 @@
 +       mtc0_tlbw_hazard();
 +       tlb_write_indexed();
++       tlbw_use_hazard();
 +       write_c0_entryhi(old_ctx);
 +       EXIT_CRITICAL(flags);
@@ -2526 +2398 @@
  {
         unsigned long kmap_vstart;
-@@ -98,11 +296,12 @@
+@@ -97,11 +296,12 @@
  
         kmap_prot = PAGE_KERNEL;
@@ -2540 +2412 @@
         pud_t *pud;
         pmd_t *pmd;
-@@ -123,7 +322,7 @@
+@@ -122,7 +322,7 @@
                         for (; (k < PTRS_PER_PMD) && (vaddr != end); pmd++, k++) {
                                 if (pmd_none(*pmd)) {
@@ -2549 +2421 @@
                                                 BUG();
                                 }
-@@ -133,9 +332,8 @@
+@@ -132,9 +332,8 @@
                 }
                 j = 0;
@@ -2560 +2432 @@
  #ifndef CONFIG_NEED_MULTIPLE_NODES
  extern void pagetable_init(void);
-@@ -150,6 +348,7 @@
+@@ -175,6 +374,7 @@
  #ifdef CONFIG_HIGHMEM
         kmap_init();
@@ -2568 +2440 @@
         max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
         low = max_low_pfn;
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/Makefile linux-2.6.17.13/arch/mips/mm/Makefile
---- linux-2.6.17.13.orig/arch/mips/mm/Makefile  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/Makefile       2006-09-09 10:17:04.000000000 -0700
-@@ -30,6 +30,7 @@
- obj-$(CONFIG_IP22_CPU_SCACHE)  += sc-ip22.o
- obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
- obj-$(CONFIG_RM7000_CPU_SCACHE)        += sc-rm7k.o
-+obj-$(CONFIG_MIPS_CPU_SCACHE)  += sc-mips.o
- 
- #
- # Choose one DMA coherency model
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/pgtable-32.c linux-2.6.17.13/arch/mips/mm/pgtable-32.c
---- linux-2.6.17.13.orig/arch/mips/mm/pgtable-32.c      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/pgtable-32.c   2006-09-09 10:17:04.000000000 -0700
-@@ -32,9 +32,10 @@
+diff -Naur linux-2.6.18/arch/mips/mm/pgtable-32.c linux-2.6.18.mips/arch/mips/mm/pgtable-32.c
+--- linux-2.6.18/arch/mips/mm/pgtable-32.c      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/pgtable-32.c 2006-09-20 06:55:21.000000000 -0700
+@@ -31,9 +31,10 @@
  
  void __init pagetable_init(void)
@@ -2595 +2456 @@
         pmd_t *pmd;
         pte_t *pte;
-@@ -45,7 +46,6 @@
+@@ -44,7 +45,6 @@
         pgd_init((unsigned long)swapper_pg_dir
                  + sizeof(pgd_t) * USER_PTRS_PER_PGD);
@@ -2603 +2464 @@
  
         /*
-@@ -54,6 +54,7 @@
+@@ -53,6 +53,7 @@
         vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
         fixrange_init(vaddr, 0, pgd_base);
@@ -2611 +2472 @@
          * Permanent kmaps:
          */
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/pgtable-64.c linux-2.6.17.13/arch/mips/mm/pgtable-64.c
---- linux-2.6.17.13.orig/arch/mips/mm/pgtable-64.c      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/mm/pgtable-64.c   2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/arch/mips/mm/pgtable-64.c linux-2.6.18.mips/arch/mips/mm/pgtable-64.c
+--- linux-2.6.18/arch/mips/mm/pgtable-64.c      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/mm/pgtable-64.c 2006-09-20 06:55:21.000000000 -0700
 @@ -8,6 +8,7 @@
   */
@@ -2640 +2501 @@
 +       fixrange_init(vaddr, 0, pgd_base);
  }
-diff -Naur linux-2.6.17.13.orig/arch/mips/mm/sc-mips.c linux-2.6.17.13/arch/mips/mm/sc-mips.c
---- linux-2.6.17.13.orig/arch/mips/mm/sc-mips.c 1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/arch/mips/mm/sc-mips.c      2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,112 @@
-+/*
-+ * Copyright (C) 2006 Chris Dearman (chris@mips.com),
-+ */
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/mm.h>
-+
-+#include <asm/mipsregs.h>
-+#include <asm/bcache.h>
-+#include <asm/cacheops.h>
-+#include <asm/page.h>
-+#include <asm/pgtable.h>
-+#include <asm/system.h>
-+#include <asm/mmu_context.h>
-+#include <asm/r4kcache.h>
-+
-+/*
-+ * MIPS32/MIPS64 L2 cache handling
-+ */
-+
-+/*
-+ * Writeback and invalidate the secondary cache before DMA.
-+ */
-+static void mips_sc_wback_inv(unsigned long addr, unsigned long size)
-+{
-+       blast_scache_range(addr, addr + size);
-+}
-+
-+/*
-+ * Invalidate the secondary cache before DMA.
-+ */
-+static void mips_sc_inv(unsigned long addr, unsigned long size)
-+{
-+       blast_inv_scache_range(addr, addr + size);
-+}
-+
-+static void mips_sc_enable(void)
-+{
-+       /* L2 cache is permanently enabled */
-+}
-+
-+static void mips_sc_disable(void)
-+{
-+       /* L2 cache is permanently enabled */
-+}
-+
-+static struct bcache_ops mips_sc_ops = {
-+       .bc_enable = mips_sc_enable,
-+       .bc_disable = mips_sc_disable,
-+       .bc_wback_inv = mips_sc_wback_inv,
-+       .bc_inv = mips_sc_inv
-+};
-+
-+static inline int __init mips_sc_probe(void)
-+{
-+       struct cpuinfo_mips *c = &current_cpu_data;
-+       unsigned int config1, config2;
-+       unsigned int tmp;
-+
-+       /* Mark as not present until probe completed */
-+       c->scache.flags |= MIPS_CACHE_NOT_PRESENT;
-+
-+       /* Ignore anything but MIPSxx processors */
-+       if (c->isa_level != MIPS_CPU_ISA_M32R1 &&
-+           c->isa_level != MIPS_CPU_ISA_M32R2 &&
-+           c->isa_level != MIPS_CPU_ISA_M64R1 &&
-+           c->isa_level != MIPS_CPU_ISA_M64R2)
-+               return 0;
-+
-+       /* Does this MIPS32/MIPS64 CPU have a config2 register? */
-+       config1 = read_c0_config1();
-+       if (!(config1 & MIPS_CONF_M))
-+               return 0;
-+
-+       config2 = read_c0_config2();
-+       tmp = (config2 >> 4) & 0x0f;
-+       if (0 < tmp && tmp <= 7)
-+               c->scache.linesz = 2 << tmp;
-+       else
-+               return 0;
-+
-+       tmp = (config2 >> 8) & 0x0f;
-+       if (0 <= tmp && tmp <= 7)
-+               c->scache.sets = 64 << tmp;
-+       else
-+               return 0;
-+
-+       tmp = (config2 >> 0) & 0x0f;
-+       if (0 <= tmp && tmp <= 7)
-+               c->scache.ways = tmp + 1;
-+       else
-+               return 0;
-+
-+       c->scache.waysize = c->scache.sets * c->scache.linesz;
-+       c->scache.waybit = __ffs(c->scache.waysize);
-+
-+       c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
-+
-+       return 1;
-+}
-+
-+int __init mips_sc_init(void)
-+{
-+       int found = mips_sc_probe ();
-+       if (found) {
-+               mips_sc_enable();
-+               bcops = &mips_sc_ops;
-+       }
-+       return found;
-+}
-+
-diff -Naur linux-2.6.17.13.orig/arch/mips/pci/fixup-tb0219.c linux-2.6.17.13/arch/mips/pci/fixup-tb0219.c
---- linux-2.6.17.13.orig/arch/mips/pci/fixup-tb0219.c   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/pci/fixup-tb0219.c        2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/arch/mips/pci/fixup-atlas.c linux-2.6.18.mips/arch/mips/pci/fixup-atlas.c
+--- linux-2.6.18/arch/mips/pci/fixup-atlas.c    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/pci/fixup-atlas.c       2006-09-20 06:55:21.000000000 -0700
+@@ -21,16 +21,16 @@
+ 
+ #include <asm/mips-boards/atlasint.h>
+ 
+-#define PCIA           ATLASINT_PCIA
+-#define PCIB           ATLASINT_PCIB
+-#define PCIC           ATLASINT_PCIC
+-#define PCID           ATLASINT_PCID
+-#define INTA           ATLASINT_INTA
+-#define INTB           ATLASINT_INTB
+-#define ETH            ATLASINT_ETH
+-#define INTC           ATLASINT_INTC
+-#define SCSI           ATLASINT_SCSI
+-#define INTD           ATLASINT_INTD
++#define PCIA           ATLAS_INT_PCIA
++#define PCIB           ATLAS_INT_PCIB
++#define PCIC           ATLAS_INT_PCIC
++#define PCID           ATLAS_INT_PCID
++#define INTA           ATLAS_INT_INTA
++#define INTB           ATLAS_INT_INTB
++#define ETH            ATLAS_INT_ETH
++#define INTC           ATLAS_INT_INTC
++#define SCSI           ATLAS_INT_SCSI
++#define INTD           ATLAS_INT_INTD
+ 
+ static char irq_tab[][5] __initdata = {
+        /*      INTA    INTB    INTC    INTD */
+diff -Naur linux-2.6.18/arch/mips/pci/fixup-tb0219.c linux-2.6.18.mips/arch/mips/pci/fixup-tb0219.c
+--- linux-2.6.18/arch/mips/pci/fixup-tb0219.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/pci/fixup-tb0219.c      2006-09-20 06:55:21.000000000 -0700
 @@ -2,7 +2,7 @@
   *  fixup-tb0219.c, The TANBAC TB0219 specific PCI fixups.
@@ -2768 +2543 @@
   *  This program is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU General Public License as published by
-diff -Naur linux-2.6.17.13.orig/arch/mips/pci/ops-au1000.c linux-2.6.17.13/arch/mips/pci/ops-au1000.c
---- linux-2.6.17.13.orig/arch/mips/pci/ops-au1000.c     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/pci/ops-au1000.c  2006-09-09 10:17:04.000000000 -0700
-@@ -111,7 +111,7 @@
+diff -Naur linux-2.6.18/arch/mips/pci/Makefile linux-2.6.18.mips/arch/mips/pci/Makefile
+--- linux-2.6.18/arch/mips/pci/Makefile 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/pci/Makefile    2006-09-20 06:55:21.000000000 -0700
+@@ -28,7 +28,7 @@
+ obj-$(CONFIG_LASAT)            += pci-lasat.o
+ obj-$(CONFIG_MIPS_ATLAS)       += fixup-atlas.o
+ obj-$(CONFIG_MIPS_COBALT)      += fixup-cobalt.o
+-obj-$(CONFIG_MIPS_EV96100)     += fixup-ev64120.o
++obj-$(CONFIG_MIPS_EV64120)     += fixup-ev64120.o
+ obj-$(CONFIG_MIPS_EV96100)     += fixup-ev96100.o pci-ev96100.o
+ obj-$(CONFIG_MIPS_ITE8172)     += fixup-ite8172g.o
+ obj-$(CONFIG_MIPS_IVR)         += fixup-ivr.o
+diff -Naur linux-2.6.18/arch/mips/pci/ops-au1000.c linux-2.6.18.mips/arch/mips/pci/ops-au1000.c
+--- linux-2.6.18/arch/mips/pci/ops-au1000.c     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/pci/ops-au1000.c        2006-09-20 06:55:21.000000000 -0700
+@@ -110,7 +110,7 @@
         if (first_cfg) {
                 /* reserve a wired entry for pci config accesses */
@@ -2780 +2567 @@
                         panic (KERN_ERR "PCI unable to get vm area\n");
                 pci_cfg_wired_entry = read_c0_wired();
-diff -Naur linux-2.6.17.13.orig/arch/mips/qemu/Makefile linux-2.6.17.13/arch/mips/qemu/Makefile
---- linux-2.6.17.13.orig/arch/mips/qemu/Makefile        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/qemu/Makefile     2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/arch/mips/qemu/Makefile linux-2.6.18.mips/arch/mips/qemu/Makefile
+--- linux-2.6.18/arch/mips/qemu/Makefile        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/qemu/Makefile   2006-09-20 06:55:21.000000000 -0700
 @@ -4,4 +4,5 @@
  
- obj-y          = q-firmware.o q-irq.o q-mem.o q-setup.o
+ obj-y          = q-firmware.o q-irq.o q-mem.o q-setup.o q-reset.o
  
 +obj-$(CONFIG_VT) += q-vga.o
  obj-$(CONFIG_SMP) += q-smp.o
-diff -Naur linux-2.6.17.13.orig/arch/mips/qemu/q-setup.c linux-2.6.17.13/arch/mips/qemu/q-setup.c
---- linux-2.6.17.13.orig/arch/mips/qemu/q-setup.c       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/qemu/q-setup.c    2006-09-09 10:17:04.000000000 -0700
-@@ -2,6 +2,8 @@
+diff -Naur linux-2.6.18/arch/mips/qemu/q-setup.c linux-2.6.18.mips/arch/mips/qemu/q-setup.c
+--- linux-2.6.18/arch/mips/qemu/q-setup.c       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/qemu/q-setup.c  2006-09-20 06:55:21.000000000 -0700
+@@ -2,6 +2,7 @@
  #include <asm/io.h>
  #include <asm/time.h>
  
 +extern void qvga_init(void);
-+
+ extern void qemu_reboot_setup(void);
+ 
  #define QEMU_PORT_BASE 0xb4000000
- 
- const char *get_system_type(void)
-@@ -21,5 +23,8 @@
- void __init plat_setup(void)
+@@ -23,5 +24,9 @@
+ void __init plat_mem_setup(void)
  {
         set_io_port_base(QEMU_PORT_BASE);
@@ -2808 +2594 @@
 +       qvga_init();
 +#endif
-        board_timer_setup = qemu_timer_setup;
++
+        qemu_reboot_setup();
  }
-diff -Naur linux-2.6.17.13.orig/arch/mips/qemu/q-vga.c linux-2.6.17.13/arch/mips/qemu/q-vga.c
---- linux-2.6.17.13.orig/arch/mips/qemu/q-vga.c 1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/arch/mips/qemu/q-vga.c      2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,188 @@
+diff -Naur linux-2.6.18/arch/mips/qemu/q-vga.c linux-2.6.18.mips/arch/mips/qemu/q-vga.c
+--- linux-2.6.18/arch/mips/qemu/q-vga.c 1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/arch/mips/qemu/q-vga.c    2006-09-20 06:55:21.000000000 -0700
+@@ -0,0 +1,189 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
@@ -2824 +2611 @@
 + */
 +#include <linux/init.h>
++#include <linux/screen_info.h>
 +#include <linux/tty.h>
 +#include <asm/io.h>
@@ -3002 +2790 @@
 +#endif
 +}
-diff -Naur linux-2.6.17.13.orig/arch/mips/sgi-ip22/ip22-time.c linux-2.6.17.13/arch/mips/sgi-ip22/ip22-time.c
---- linux-2.6.17.13.orig/arch/mips/sgi-ip22/ip22-time.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sgi-ip22/ip22-time.c      2006-09-09 10:17:04.000000000 -0700
-@@ -76,7 +76,7 @@
-        save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff;
-        hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE;
- 
--       hpc3c0->rtcregs[RTC_YEAR] = BIN2BCD(tm.tm_sec);
-+       hpc3c0->rtcregs[RTC_YEAR] = BIN2BCD(tm.tm_year);
-        hpc3c0->rtcregs[RTC_MONTH] = BIN2BCD(tm.tm_mon);
-        hpc3c0->rtcregs[RTC_DATE] = BIN2BCD(tm.tm_mday);
-        hpc3c0->rtcregs[RTC_HOURS] = BIN2BCD(tm.tm_hour);
-diff -Naur linux-2.6.17.13.orig/arch/mips/sgi-ip27/ip27-irq.c linux-2.6.17.13/arch/mips/sgi-ip27/ip27-irq.c
---- linux-2.6.17.13.orig/arch/mips/sgi-ip27/ip27-irq.c  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sgi-ip27/ip27-irq.c       2006-09-09 10:17:04.000000000 -0700
-@@ -360,7 +360,7 @@
- 
- static unsigned long irq_map[NR_IRQS / BITS_PER_LONG];
- 
--static int allocate_irqno(void)
-+int allocate_irqno(void)
- {
-        int irq;
- 
-diff -Naur linux-2.6.17.13.orig/arch/mips/sgi-ip27/ip27-timer.c linux-2.6.17.13/arch/mips/sgi-ip27/ip27-timer.c
---- linux-2.6.17.13.orig/arch/mips/sgi-ip27/ip27-timer.c        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sgi-ip27/ip27-timer.c     2006-09-09 10:17:04.000000000 -0700
-@@ -89,11 +89,13 @@
+diff -Naur linux-2.6.18/arch/mips/sibyte/bcm1480/irq.c linux-2.6.18.mips/arch/mips/sibyte/bcm1480/irq.c
+--- linux-2.6.18/arch/mips/sibyte/bcm1480/irq.c 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/sibyte/bcm1480/irq.c    2006-09-20 06:55:21.000000000 -0700
+@@ -469,21 +469,6 @@
+ 
+ #endif         /* CONFIG_KGDB */
+ 
+-static inline int dclz(unsigned long long x)
+-{
+-       int lz;
+-
+-       __asm__ (
+-       "       .set    push                                            \n"
+-       "       .set    mips64                                          \n"
+-       "       dclz    %0, %1                                          \n"
+-       "       .set    pop                                             \n"
+-       : "=r" (lz)
+-       : "r" (x));
+-
+-       return lz;
+-}
+-
+ extern void bcm1480_timer_interrupt(struct pt_regs *regs);
+ extern void bcm1480_mailbox_interrupt(struct pt_regs *regs);
+ extern void bcm1480_kgdb_interrupt(struct pt_regs *regs);
+@@ -536,9 +521,9 @@
+ 
+                if (mask_h) {
+                        if (mask_h ^ 1)
+-                               do_IRQ(63 - dclz(mask_h), regs);
++                               do_IRQ(fls64(mask_h) - 1, regs);
+                        else
+-                               do_IRQ(127 - dclz(mask_l), regs);
++                               do_IRQ(63 + fls64(mask_l), regs);
+                }
+        }
  }
- #endif
- 
-+static unsigned int rt_timer_irq;
-+
- void ip27_rt_timer_interrupt(struct pt_regs *regs)
- {
-        int cpu = smp_processor_id();
-        int cpuA = cputoslice(cpu) == 0;
--       int irq = 9;                            /* XXX Assign number */
-+       unsigned int irq = rt_timer_irq;
- 
-        irq_enter();
-        write_seqlock(&xtime_lock);
-@@ -179,13 +181,68 @@
-         return mktime(year, month, date, hour, min, sec);
- }
- 
-+static void startup_rt_irq(unsigned int irq)
-+{
-+}
-+
-+static void shutdown_rt_irq(unsigned int irq)
-+{
-+}
-+
-+static void enable_rt_irq(unsigned int irq)
-+{
-+}
-+
-+static void disable_rt_irq(unsigned int irq)
-+{
-+}
-+
-+static void mask_and_ack_rt(unsigned int irq)
-+{
-+}
-+
-+static void end_rt_irq(unsigned int irq)
-+{
-+}
-+
-+static struct hw_interrupt_type rt_irq_type = {
-+       .typename       = "SN HUB RT timer",
-+       .startup        = startup_rt_irq,
-+       .shutdown       = shutdown_rt_irq,
-+       .enable         = enable_rt_irq,
-+       .disable        = disable_rt_irq,
-+       .ack            = mask_and_ack_rt,
-+       .end            = end_rt_irq,
-+};
-+
-+static struct irqaction rt_irqaction = {
-+       .handler        = ip27_rt_timer_interrupt,
-+       .flags          = SA_INTERRUPT,
-+       .mask           = CPU_MASK_NONE,
-+       .name           = "timer"
-+};
-+
-+extern int allocate_irqno(void);
-+
- static void ip27_timer_setup(struct irqaction *irq)
- {
-+       int irqno  = allocate_irqno();
-+
-+       if (irqno < 0)
-+               panic("Can't allocate interrupt number for timer interrupt");
-+
-+       irq_desc[irqno].status = IRQ_DISABLED;
-+       irq_desc[irqno].action = NULL;
-+       irq_desc[irqno].depth = 1;
-+       irq_desc[irqno].handler = &rt_irq_type;
-+
-        /* over-write the handler, we use our own way */
-        irq->handler = no_action;
- 
-        /* setup irqaction */
--//     setup_irq(IP27_TIMER_IRQ, irq);         /* XXX Can't do this yet.  */
-+       irq_desc[irqno].status |= IRQ_PER_CPU;
-+
-+       rt_timer_irq = irqno;
- }
- 
- void __init ip27_time_init(void)
-diff -Naur linux-2.6.17.13.orig/arch/mips/sgi-ip27/Kconfig linux-2.6.17.13/arch/mips/sgi-ip27/Kconfig
---- linux-2.6.17.13.orig/arch/mips/sgi-ip27/Kconfig     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sgi-ip27/Kconfig  2006-09-09 10:17:04.000000000 -0700
-@@ -35,12 +35,13 @@
-        depends on SGI_IP27
-        help
-          Change the way a Linux kernel is loaded into memory on a MIPS64
--         machine.  This is required in order to support text replication and
-+         machine.  This is required in order to support text replication on
-          NUMA.  If you need to understand it, read the source code.
- 
- config REPLICATE_KTEXT
-        bool "Kernel text replication support"
-        depends on SGI_IP27
-+       select MAPPED_KERNEL
-        help
-          Say Y here to enable replicating the kernel text across multiple
-          nodes in a NUMA cluster.  This trades memory for speed.
-diff -Naur linux-2.6.17.13.orig/arch/mips/sibyte/bcm1480/irq.c linux-2.6.17.13/arch/mips/sibyte/bcm1480/irq.c
---- linux-2.6.17.13.orig/arch/mips/sibyte/bcm1480/irq.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sibyte/bcm1480/irq.c      2006-09-09 10:17:04.000000000 -0700
-@@ -503,22 +503,23 @@
- #ifdef CONFIG_SIBYTE_BCM1480_PROF
-        if (pending & CAUSEF_IP7)       /* Cpu performance counter interrupt */
-                sbprof_cpu_intr(exception_epc(regs));
-+       else
- #endif
- 
-        if (pending & CAUSEF_IP4)
-                bcm1480_timer_interrupt(regs);
- 
- #ifdef CONFIG_SMP
--       if (pending & CAUSEF_IP3)
-+       else if (pending & CAUSEF_IP3)
-                bcm1480_mailbox_interrupt(regs);
- #endif
- 
- #ifdef CONFIG_KGDB
--       if (pending & CAUSEF_IP6)
-+       else if (pending & CAUSEF_IP6)
-                bcm1480_kgdb_interrupt(regs);           /* KGDB (uart 1) */
- #endif
- 
--       if (pending & CAUSEF_IP2) {
-+       else if (pending & CAUSEF_IP2) {
-                unsigned long long mask_h, mask_l;
-                unsigned long base;
- 
-@@ -534,7 +535,7 @@
-                mask_l = __raw_readq(
-                        IOADDR(base + R_BCM1480_IMR_INTERRUPT_STATUS_BASE_L));
- 
--               if (!mask_h) {
-+               if (mask_h) {
-                        if (mask_h ^ 1)
-                                do_IRQ(63 - dclz(mask_h), regs);
-                        else
-diff -Naur linux-2.6.17.13.orig/arch/mips/sibyte/bcm1480/time.c linux-2.6.17.13/arch/mips/sibyte/bcm1480/time.c
---- linux-2.6.17.13.orig/arch/mips/sibyte/bcm1480/time.c        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sibyte/bcm1480/time.c     2006-09-09 10:17:04.000000000 -0700
-@@ -110,17 +110,18 @@
-        __raw_writeq(M_SCD_TIMER_ENABLE|M_SCD_TIMER_MODE_CONTINUOUS,
-              IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
- 
--       /*
--        * CPU 0 handles the global timer interrupt job
--        */
-        if (cpu == 0) {
-+               /*
-+                * CPU 0 handles the global timer interrupt job
-+                */
-                ll_timer_interrupt(irq, regs);
-        }
+diff -Naur linux-2.6.18/arch/mips/sibyte/sb1250/irq.c linux-2.6.18.mips/arch/mips/sibyte/sb1250/irq.c
+--- linux-2.6.18/arch/mips/sibyte/sb1250/irq.c  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/arch/mips/sibyte/sb1250/irq.c     2006-09-20 06:55:21.000000000 -0700
+@@ -419,21 +419,6 @@
+ 
+ #endif         /* CONFIG_KGDB */
+ 
+-static inline int dclz(unsigned long long x)
+-{
+-       int lz;
 -
--       /*
--        * every CPU should do profiling and process accouting
--        */
--       ll_local_timer_interrupt(irq, regs);
-+       else {
-+               /*
-+                * other CPUs should just do profiling and process accounting
-+                */
-+               ll_local_timer_interrupt(irq, regs);
-+       }
- }
- 
- /*
-diff -Naur linux-2.6.17.13.orig/arch/mips/sibyte/Kconfig linux-2.6.17.13/arch/mips/sibyte/Kconfig
---- linux-2.6.17.13.orig/arch/mips/sibyte/Kconfig       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sibyte/Kconfig    2006-09-09 10:17:04.000000000 -0700
-@@ -3,6 +3,7 @@
-        select HW_HAS_PCI
-        select SIBYTE_HAS_LDT
-        select SIBYTE_SB1xxx_SOC
-+       select SYS_SUPPORTS_SMP
- 
- config SIBYTE_BCM1120
-        bool
-@@ -30,11 +31,13 @@
-        bool
-        select HW_HAS_PCI
-        select SIBYTE_SB1xxx_SOC
-+       select SYS_SUPPORTS_SMP
- 
- config SIBYTE_BCM1x55
-        bool
-        select HW_HAS_PCI
-        select SIBYTE_SB1xxx_SOC
-+       select SYS_SUPPORTS_SMP
- 
- config SIBYTE_SB1xxx_SOC
-        bool
-diff -Naur linux-2.6.17.13.orig/arch/mips/sibyte/sb1250/irq.c linux-2.6.17.13/arch/mips/sibyte/sb1250/irq.c
---- linux-2.6.17.13.orig/arch/mips/sibyte/sb1250/irq.c  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sibyte/sb1250/irq.c       2006-09-09 10:17:04.000000000 -0700
-@@ -435,13 +435,17 @@
-        return lz;
- }
- 
-+extern void sb1250_timer_interrupt(struct pt_regs *regs);
-+extern void sb1250_mailbox_interrupt(struct pt_regs *regs);
-+extern void sb1250_kgdb_interrupt(struct pt_regs *regs);
-+
- asmlinkage void plat_irq_dispatch(struct pt_regs *regs)
- {
-        unsigned int pending;
- 
- #ifdef CONFIG_SIBYTE_SB1250_PROF
-        /* Set compare to count to silence count/compare timer interrupts */
--       write_c0_count(read_c0_count());
-+       write_c0_compare(read_c0_count());
- #endif
- 
-        /*
-@@ -457,32 +461,32 @@
-        pending = read_c0_cause();
- 
- #ifdef CONFIG_SIBYTE_SB1250_PROF
--       if (pending & CAUSEF_IP7) { /* Cpu performance counter interrupt */
-+       if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */
-                sbprof_cpu_intr(exception_epc(regs));
--       }
-+       else
- #endif
- 
-        if (pending & CAUSEF_IP4)
-                sb1250_timer_interrupt(regs);
- 
- #ifdef CONFIG_SMP
--       if (pending & CAUSEF_IP3)
-+       else if (pending & CAUSEF_IP3)
-                sb1250_mailbox_interrupt(regs);
- #endif
- 
- #ifdef CONFIG_KGDB
--       if (pending & CAUSEF_IP6)                       /* KGDB (uart 1) */
-+       else if (pending & CAUSEF_IP6)                  /* KGDB (uart 1) */
-                sb1250_kgdb_interrupt(regs);
- #endif
- 
--       if (pending & CAUSEF_IP2) {
-+       else if (pending & CAUSEF_IP2) {
-                unsigned long long mask;
- 
-                /*
-                 * Default...we've hit an IP[2] interrupt, which means we've
-                 * got to check the 1250 interrupt registers to figure out what
-                 * to do.  Need to detect which CPU we're on, now that
--                ~ smp_affinity is supported.
-+                * smp_affinity is supported.
-                 */
+-       __asm__ (
+-       "       .set    push                                            \n"
+-       "       .set    mips64                                          \n"
+-       "       dclz    %0, %1                                          \n"
+-       "       .set    pop                                             \n"
+-       : "=r" (lz)
+-       : "r" (x));
+-
+-       return lz;
+-}
+-
+ extern void sb1250_timer_interrupt(struct pt_regs *regs);
+ extern void sb1250_mailbox_interrupt(struct pt_regs *regs);
+ extern void sb1250_kgdb_interrupt(struct pt_regs *regs);
+@@ -490,6 +475,6 @@
                 mask = __raw_readq(IOADDR(A_IMR_REGISTER(smp_processor_id(),
                                               R_IMR_INTERRUPT_STATUS_BASE)));
-diff -Naur linux-2.6.17.13.orig/arch/mips/sibyte/swarm/setup.c linux-2.6.17.13/arch/mips/sibyte/swarm/setup.c
---- linux-2.6.17.13.orig/arch/mips/sibyte/swarm/setup.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/arch/mips/sibyte/swarm/setup.c      2006-09-09 10:17:04.000000000 -0700
-@@ -72,8 +72,10 @@
- 
- void __init swarm_time_init(void)
- {
-+#if defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
-        /* Setup HPT */
-        sb1250_hpt_setup();
-+#endif
+                if (mask)
+-                       do_IRQ(63 - dclz(mask), regs);
++                       do_IRQ(fls64(mask) - 1, regs);
+        }
  }
- 
- void __init swarm_timer_setup(struct irqaction *irq)
-diff -Naur linux-2.6.17.13.orig/Documentation/feature-removal-schedule.txt linux-2.6.17.13/Documentation/feature-removal-schedule.txt
---- linux-2.6.17.13.orig/Documentation/feature-removal-schedule.txt     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/Documentation/feature-removal-schedule.txt  2006-09-09 10:17:04.000000000 -0700
-@@ -147,16 +147,6 @@
- 
- ---------------------------
- 
--What:  au1x00_uart driver
--When:  January 2006
--Why:   The 8250 serial driver now has the ability to deal with the differences
--       between the standard 8250 family of UARTs and their slightly strange
--       brother on Alchemy SOCs.  The loss of features is not considered an
--       issue.
--Who:   Ralf Baechle <ralf@linux-mips.org>
--
-----------------------------
--
- What:   eepro100 network driver
- When:   January 2007
- Why:    replaced by the e100 driver
-diff -Naur linux-2.6.17.13.orig/drivers/char/au1000_gpio.c linux-2.6.17.13/drivers/char/au1000_gpio.c
---- linux-2.6.17.13.orig/drivers/char/au1000_gpio.c     1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/char/au1000_gpio.c  2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/char/au1000_gpio.c linux-2.6.18.mips/drivers/char/au1000_gpio.c
+--- linux-2.6.18/drivers/char/au1000_gpio.c     1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/char/au1000_gpio.c        2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,266 @@
 +/*
@@ -3591 +3130 @@
 +module_init(au1000gpio_init);
 +module_exit(au1000gpio_exit);
-diff -Naur linux-2.6.17.13.orig/drivers/char/au1000_ts.c linux-2.6.17.13/drivers/char/au1000_ts.c
---- linux-2.6.17.13.orig/drivers/char/au1000_ts.c       1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/char/au1000_ts.c    2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/char/au1000_ts.c linux-2.6.18.mips/drivers/char/au1000_ts.c
+--- linux-2.6.18/drivers/char/au1000_ts.c       1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/char/au1000_ts.c  2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,677 @@
 +/*
@@ -4272 +3811 @@
 +module_init(au1000ts_init_module);
 +module_exit(au1000ts_cleanup_module);
-diff -Naur linux-2.6.17.13.orig/drivers/char/au1000_usbraw.c linux-2.6.17.13/drivers/char/au1000_usbraw.c
---- linux-2.6.17.13.orig/drivers/char/au1000_usbraw.c   1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/char/au1000_usbraw.c        2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/char/au1000_usbraw.c linux-2.6.18.mips/drivers/char/au1000_usbraw.c
+--- linux-2.6.18/drivers/char/au1000_usbraw.c   1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/char/au1000_usbraw.c      2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,573 @@
 +/*
@@ -4849 +4388 @@
 +module_init(usbfn_raw_init);
 +module_exit(usbfn_raw_exit);
-diff -Naur linux-2.6.17.13.orig/drivers/char/au1000_usbtty.c linux-2.6.17.13/drivers/char/au1000_usbtty.c
---- linux-2.6.17.13.orig/drivers/char/au1000_usbtty.c   1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/char/au1000_usbtty.c        2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/char/au1000_usbtty.c linux-2.6.18.mips/drivers/char/au1000_usbtty.c
+--- linux-2.6.18/drivers/char/au1000_usbtty.c   1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/char/au1000_usbtty.c      2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,761 @@
 +/*
@@ -5614 +5153 @@
 +module_init(usbfn_tty_init);
 +module_exit(usbfn_tty_exit);
-diff -Naur linux-2.6.17.13.orig/drivers/char/decserial.c linux-2.6.17.13/drivers/char/decserial.c
---- linux-2.6.17.13.orig/drivers/char/decserial.c       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/char/decserial.c    2006-09-09 10:17:04.000000000 -0700
-@@ -14,87 +14,85 @@
+diff -Naur linux-2.6.18/drivers/char/decserial.c linux-2.6.18.mips/drivers/char/decserial.c
+--- linux-2.6.18/drivers/char/decserial.c       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/char/decserial.c  2006-09-20 06:55:21.000000000 -0700
+@@ -14,86 +14,84 @@
   *      device. Added support for PROM console in drivers/char/tty_io.c
   *      instead. Although it may work to enable more than one 
@@ -5625 +5164 @@
   */
  
- #include <linux/config.h>
 +#include <linux/errno.h>
  #include <linux/init.h>
@@ -5751 +5289 @@
  
  #endif
-diff -Naur linux-2.6.17.13.orig/drivers/char/ibm_workpad_keymap.map linux-2.6.17.13/drivers/char/ibm_workpad_keymap.map
---- linux-2.6.17.13.orig/drivers/char/ibm_workpad_keymap.map    1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/char/ibm_workpad_keymap.map 2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,343 @@
-+# Keymap for IBM Workpad z50
-+# US Mapping
-+#
-+# by Michael Klar <wyldfier@iname.com>
-+#
-+# This is a great big mess on account of how the Caps Lock key is handled as
-+# LeftShift-RightShift.  Right shift key had to be broken out, so don't use
-+# use this map file as a basis for other keyboards that don't do the same
-+# thing with Caps Lock.
-+#
-+# This file is subject to the terms and conditions of the GNU General Public
-+# License.  See the file "COPYING" in the main directory of this archive
-+# for more details.
-+
-+keymaps 0-2,4-5,8,12,32-33,36-37
-+strings as usual
-+
-+keycode 0 = F1 F11 Console_13
-+       shiftr keycode 0 = F11
-+       shift shiftr keycode 0 = F11
-+       control keycode 0 = F1
-+       alt keycode 0 = Console_1
-+       control alt keycode 0 = Console_1
-+keycode 1 = F3 F13 Console_15
-+       shiftr keycode 1 = F13
-+       shift shiftr keycode 1 = F13
-+       control keycode 1 = F3
-+       alt keycode 1 = Console_3
-+       control alt keycode 1 = Console_3
-+keycode 2 = F5 F15 Console_17
-+       shiftr keycode 2 = F15
-+       shift shiftr keycode 2 = F15
-+       control keycode 2 = F5
-+       alt keycode 2 = Console_5
-+       control alt keycode 2 = Console_5
-+keycode 3 = F7 F17 Console_19
-+       shiftr keycode 3 = F17
-+       shift shiftr keycode 3 = F17
-+       control keycode 3 = F7
-+       alt keycode 3 = Console_7
-+       control alt keycode 3 = Console_7
-+keycode 4 = F9 F19 Console_21
-+       shiftr keycode 4 = F19
-+       shift shiftr keycode 4 = F19
-+       control keycode 4 = F9
-+       alt keycode 4 = Console_9
-+       control alt keycode 4 = Console_9
-+#keycode 5 is contrast down
-+#keycode 6 is contrast up
-+keycode 7 = F11 F11 Console_23
-+       shiftr keycode 7 = F11
-+       shift shiftr keycode 7 = F11
-+       control keycode 7 = F11
-+       alt keycode 7 = Console_11
-+       control alt keycode 7 = Console_11
-+keycode 8 = F2 F12 Console_14
-+       shiftr keycode 8 = F12
-+       shift shiftr keycode 8 = F12
-+       control keycode 8 = F2
-+       alt keycode 8 = Console_2
-+       control alt keycode 8 = Console_2
-+keycode 9 = F4 F14 Console_16
-+       shiftr keycode 9 = F14
-+       shift shiftr keycode 9 = F14
-+       control keycode 9 = F4
-+       alt keycode 9 = Console_4
-+       control alt keycode 9 = Console_4
-+keycode 10 = F6 F16 Console_18
-+       shiftr keycode 10 = F16
-+       shift shiftr keycode 10 = F16
-+       control keycode 10 = F6
-+       alt keycode 10 = Console_6
-+       control alt keycode 10 = Console_6
-+keycode 11 = F8 F18 Console_20
-+       shiftr keycode 11 = F18
-+       shift shiftr keycode 11 = F18
-+       control keycode 11 = F8
-+       alt keycode 11 = Console_8
-+       control alt keycode 11 = Console_8
-+keycode 12 = F10 F20 Console_22
-+       shiftr keycode 12 = F20
-+       shift shiftr keycode 12 = F20
-+       control keycode 12 = F10
-+       alt keycode 12 = Console_10
-+       control alt keycode 12 = Console_10
-+#keycode 13 is brightness down
-+#keycode 14 is brightness up
-+keycode 15 = F12 F12 Console_24
-+       shiftr keycode 15 = F12
-+       shift shiftr keycode 15 = F12
-+       control keycode 15 = F12
-+       alt keycode 15 = Console_12
-+       control alt keycode 15 = Console_12
-+keycode 16 = apostrophe quotedbl
-+       shiftr keycode 16 = quotedbl
-+       shift shiftr keycode 16 = quotedbl
-+       control keycode 16 = Control_g
-+       alt keycode 16 = Meta_apostrophe
-+keycode 17 = bracketleft braceleft
-+       shiftr keycode 17 = braceleft
-+       shift shiftr keycode 17 = braceleft
-+       control keycode 17 = Escape
-+       alt keycode 17 = Meta_bracketleft
-+keycode 18 = minus underscore backslash       
-+       shiftr keycode 18 = underscore
-+       shift shiftr keycode 18 = underscore
-+       control keycode 18 = Control_underscore
-+       shift control keycode 18 = Control_underscore
-+       shiftr control keycode 18 = Control_underscore
-+       shift shiftr control keycode 18 = Control_underscore
-+       alt keycode 18 = Meta_minus
-+keycode 19 = zero parenright braceright
-+       shiftr keycode 19 = parenright
-+       shift shiftr keycode 19 = parenright
-+       alt keycode 19 = Meta_zero
-+keycode 20 = p
-+       shiftr keycode 20 = +P
-+       shift shiftr keycode 20 = +p
-+keycode 21 = semicolon colon
-+       shiftr keycode 21 = colon
-+       shift shiftr keycode 21 = colon
-+       alt keycode 21 = Meta_semicolon
-+keycode 22 = Up Scroll_Backward
-+       shiftr keycode 22 = Scroll_Backward
-+       shift shiftr keycode 22 = Scroll_Backward
-+       alt keycode 22 = Prior
-+keycode 23 = slash question
-+       shiftr keycode 23 = question
-+       shift shiftr keycode 23 = question
-+       control keycode 23 = Delete
-+       alt keycode 23 = Meta_slash
-+
-+keycode 27 = nine parenleft bracketright
-+       shiftr keycode 27 = parenleft
-+       shift shiftr keycode 27 = parenleft
-+       alt keycode 27 = Meta_nine
-+keycode 28 = o
-+       shiftr keycode 28 = +O
-+       shift shiftr keycode 28 = +o
-+keycode 29 = l
-+       shiftr keycode 29 = +L
-+       shift shiftr keycode 29 = +l
-+keycode 30 = period greater
-+       shiftr keycode 30 = greater
-+       shift shiftr keycode 30 = greater
-+       control keycode 30 = Compose
-+       alt keycode 30 = Meta_period
-+
-+keycode 32 = Left Decr_Console
-+       shiftr keycode 32 = Decr_Console
-+       shift shiftr keycode 32 = Decr_Console
-+       alt keycode 32 = Home
-+keycode 33 = bracketright braceright asciitilde      
-+       shiftr keycode 33 = braceright
-+       shift shiftr keycode 33 = braceright
-+       control keycode 33 = Control_bracketright
-+       alt keycode 33 = Meta_bracketright
-+keycode 34 = equal plus
-+       shiftr keycode 34 = plus
-+       shift shiftr keycode 34 = plus
-+       alt keycode 34 = Meta_equal
-+keycode 35 = eight asterisk bracketleft
-+       shiftr keycode 35 = asterisk
-+       shift shiftr keycode 35 = asterisk
-+       control keycode 35 = Delete
-+       alt keycode 35 = Meta_eight
-+keycode 36 = i
-+       shiftr keycode 36 = +I
-+       shift shiftr keycode 36 = +i
-+keycode 37 = k
-+       shiftr keycode 37 = +K
-+       shift shiftr keycode 37 = +k
-+keycode 38 = comma less
-+       shiftr keycode 38 = less
-+       shift shiftr keycode 38 = less
-+       alt keycode 38 = Meta_comma
-+
-+keycode 40 = h
-+       shiftr keycode 40 = +H
-+       shift shiftr keycode 40 = +h
-+keycode 41 = y
-+       shiftr keycode 41 = +Y
-+       shift shiftr keycode 41 = +y
-+keycode 42 = six asciicircum
-+       shiftr keycode 42 = asciicircum
-+       shift shiftr keycode 42 = asciicircum
-+       control keycode 42 = Control_asciicircum
-+       alt keycode 42 = Meta_six
-+keycode 43 = seven ampersand braceleft
-+       shiftr keycode 43 = ampersand
-+       shift shiftr keycode 43 = ampersand
-+       control keycode 43 = Control_underscore
-+       alt keycode 43 = Meta_seven
-+keycode 44 = u
-+       shiftr keycode 44 = +U
-+       shift shiftr keycode 44 = +u
-+keycode 45 = j
-+       shiftr keycode 45 = +J
-+       shift shiftr keycode 45 = +j
-+keycode 46 = m
-+       shiftr keycode 46 = +M
-+       shift shiftr keycode 46 = +m
-+keycode 47 = n
-+       shiftr keycode 47 = +N
-+       shift shiftr keycode 47 = +n
-+
-+# This is the "Backspace" key:
-+keycode 49 = Delete Delete
-+       shiftr keycode 49 = Delete
-+       shift shiftr keycode 49 = Delete
-+       control keycode 49 = BackSpace
-+       alt keycode 49 = Meta_Delete
-+keycode 50 = Num_Lock
-+       shift keycode 50 = Bare_Num_Lock
-+       shiftr keycode 50 = Bare_Num_Lock
-+       shift shiftr keycode 50 = Bare_Num_Lock
-+# This is the "Delete" key:
-+keycode 51 = Remove
-+       control alt keycode 51 = Boot
-+
-+keycode 53 = backslash bar
-+       shiftr keycode 53 = bar
-+       shift shiftr keycode 53 = bar
-+       control keycode 53 = Control_backslash
-+       alt keycode 53 = Meta_backslash
-+keycode 54 = Return
-+       alt keycode 54 = Meta_Control_m
-+keycode 55 = space space           
-+       shiftr keycode 55 = space
-+       shift shiftr keycode 55 = space
-+       control keycode 55 = nul
-+       alt keycode 55 = Meta_space
-+keycode 56 = g
-+       shiftr keycode 56 = +G
-+       shift shiftr keycode 56 = +g
-+keycode 57 = t
-+       shiftr keycode 57 = +T
-+       shift shiftr keycode 57 = +t
-+keycode 58 = five percent
-+       shiftr keycode 58 = percent
-+       shift shiftr keycode 58 = percent
-+       control keycode 58 = Control_bracketright
-+       alt keycode 58 = Meta_five
-+keycode 59 = four dollar dollar
-+       shiftr keycode 59 = dollar
-+       shift shiftr keycode 59 = dollar
-+       control keycode 59 = Control_backslash
-+       alt keycode 59 = Meta_four
-+keycode 60 = r
-+       shiftr keycode 60 = +R
-+       shift shiftr keycode 60 = +r
-+keycode 61 = f
-+       shiftr keycode 61 = +F
-+       shift shiftr keycode 61 = +f
-+       altgr keycode 61 = Hex_F
-+keycode 62 = v
-+       shiftr keycode 62 = +V
-+       shift shiftr keycode 62 = +v
-+keycode 63 = b
-+       shiftr keycode 63 = +B
-+       shift shiftr keycode 63 = +b
-+       altgr keycode 63 = Hex_B
-+
-+keycode 67 = three numbersign
-+       shiftr keycode 67 = numbersign
-+       shift shiftr keycode 67 = numbersign
-+       control keycode 67 = Escape
-+       alt keycode 67 = Meta_three
-+keycode 68 = e
-+       shiftr keycode 68 = +E
-+       shift shiftr keycode 68 = +e
-+       altgr keycode 68 = Hex_E
-+keycode 69 = d
-+       shiftr keycode 69 = +D
-+       shift shiftr keycode 69 = +d
-+       altgr keycode 69 = Hex_D
-+keycode 70 = c
-+       shiftr keycode 70 = +C
-+       shift shiftr keycode 70 = +c
-+       altgr keycode 70 = Hex_C
-+keycode 71 = Right Incr_Console
-+       shiftr keycode 71 = Incr_Console
-+       shift shiftr keycode 71 = Incr_Console
-+       alt keycode 71 = End
-+
-+keycode 75 = two at at
-+       shiftr keycode 75 = at
-+       shift shiftr keycode 75 = at
-+       control keycode 75 = nul
-+       shift control keycode 75 = nul
-+       shiftr control keycode 75 = nul
-+       shift shiftr control keycode 75 = nul
-+       alt keycode 75 = Meta_two
-+keycode 76 = w
-+       shiftr keycode 76 = +W
-+       shift shiftr keycode 76 = +w
-+keycode 77 = s
-+       shiftr keycode 77 = +S
-+       shift shiftr keycode 77 = +s
-+keycode 78 = x
-+       shiftr keycode 78 = +X
-+       shift shiftr keycode 78 = +x
-+keycode 79 = Down Scroll_Forward
-+       shiftr keycode 79 = Scroll_Forward
-+       shift shiftr keycode 79 = Scroll_Forward
-+       alt keycode 79 = Next
-+keycode 80 = Escape Escape
-+       shiftr keycode 80 = Escape
-+       shift shiftr keycode 80 = Escape
-+       alt keycode 80 = Meta_Escape
-+keycode 81 = Tab Tab             
-+       shiftr keycode 81 = Tab
-+       shift shiftr keycode 81 = Tab
-+       alt keycode 81 = Meta_Tab
-+keycode 82 = grave asciitilde
-+       shiftr keycode 82 = asciitilde
-+       shift shiftr keycode 82 = asciitilde
-+       control keycode 82 = nul
-+       alt keycode 82 = Meta_grave
-+keycode 83 = one exclam
-+       shiftr keycode 83 = exclam
-+       shift shiftr keycode 83 = exclam
-+       alt keycode 83 = Meta_one
-+keycode 84 = q
-+       shiftr keycode 84 = +Q
-+       shift shiftr keycode 84 = +q
-+keycode 85 = a
-+       shiftr keycode 85 = +A
-+       shift shiftr keycode 85 = +a
-+       altgr keycode 85 = Hex_A
-+keycode 86 = z
-+       shiftr keycode 86 = +Z
-+       shift shiftr keycode 86 = +z
-+
-+# This is the windows key:
-+keycode 88 = Decr_Console
-+keycode 89 = Shift
-+keycode 90 = Control
-+keycode 91 = Control
-+keycode 92 = Alt
-+keycode 93 = AltGr
-+keycode 94 = ShiftR
-+       shift keycode 94 = Caps_Lock
-diff -Naur linux-2.6.17.13.orig/drivers/char/Kconfig linux-2.6.17.13/drivers/char/Kconfig
---- linux-2.6.17.13.orig/drivers/char/Kconfig   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/char/Kconfig        2006-09-09 10:17:04.000000000 -0700
-@@ -340,23 +340,68 @@
+diff -Naur linux-2.6.18/drivers/char/Kconfig linux-2.6.18.mips/drivers/char/Kconfig
+--- linux-2.6.18/drivers/char/Kconfig   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/char/Kconfig      2006-09-20 06:55:21.000000000 -0700
+@@ -357,23 +357,68 @@
           To compile this driver as a module, choose M here: the
           module will be called istallion.
@@ -6183 +5374 @@
           Images of Qtronix keyboards are at
           <http://www.qtronix.com/keyboard.html>.
-@@ -368,7 +413,7 @@
+@@ -385,7 +430,7 @@
  
  config IT8172_SCR0
@@ -6192 +5383 @@
           Say Y here to support smart-card reader 0 (SCR0) on the Integrated
           Technology Express, Inc. ITE8172 SBC.  Vendor page at
-@@ -377,13 +422,17 @@
+@@ -394,13 +439,17 @@
  
  config IT8172_SCR1
@@ -6211 +5402 @@
         tristate "Commodore A2232 serial support (EXPERIMENTAL)"
         depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP
-diff -Naur linux-2.6.17.13.orig/drivers/char/Makefile linux-2.6.17.13/drivers/char/Makefile
---- linux-2.6.17.13.orig/drivers/char/Makefile  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/char/Makefile       2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/char/Makefile linux-2.6.18.mips/drivers/char/Makefile
+--- linux-2.6.18/drivers/char/Makefile  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/char/Makefile     2006-09-20 06:55:21.000000000 -0700
 @@ -31,6 +31,7 @@
  obj-$(CONFIG_A2232)            += ser_a2232.o generic_serial.o
@@ -6231 +5422 @@
  obj-$(CONFIG_TIPAR)            += tipar.o
 @@ -78,6 +80,10 @@
- obj-$(CONFIG_HW_RANDOM)                += hw_random.o
+ obj-$(CONFIG_HW_RANDOM)                += hw_random/
  obj-$(CONFIG_FTAPE)            += ftape/
  obj-$(CONFIG_COBALT_LCD)       += lcd.o
@@ -6241 +5432 @@
  obj-$(CONFIG_NWBUTTON)         += nwbutton.o
  obj-$(CONFIG_NWFLASH)          += nwflash.o
-diff -Naur linux-2.6.17.13.orig/drivers/char/qtronix.c linux-2.6.17.13/drivers/char/qtronix.c
---- linux-2.6.17.13.orig/drivers/char/qtronix.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/char/qtronix.c      2006-09-09 10:17:04.000000000 -0700
-@@ -535,8 +535,7 @@
+diff -Naur linux-2.6.18/drivers/char/qtronix.c linux-2.6.18.mips/drivers/char/qtronix.c
+--- linux-2.6.18/drivers/char/qtronix.c 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/char/qtronix.c    2006-09-20 06:55:21.000000000 -0700
+@@ -534,8 +534,7 @@
                 i--;
         }
@@ -6254 +5445 @@
         }
         if (signal_pending(current))
-diff -Naur linux-2.6.17.13.orig/drivers/char/rtc.c linux-2.6.17.13/drivers/char/rtc.c
---- linux-2.6.17.13.orig/drivers/char/rtc.c     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/char/rtc.c  2006-09-09 10:17:04.000000000 -0700
-@@ -35,23 +35,22 @@
+diff -Naur linux-2.6.18/drivers/char/rtc.c linux-2.6.18.mips/drivers/char/rtc.c
+--- linux-2.6.18/drivers/char/rtc.c     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/char/rtc.c        2006-09-20 06:55:21.000000000 -0700
+@@ -35,16 +35,16 @@
   *     1.09a   Pete Zaitcev: Sun SPARC
   *     1.09b   Jeff Garzik: Modularize, init cleanup
@@ -6275 +5466 @@
 + *     1.12    Venkatesh Pallipadi: Hooks for emulating rtc on HPET base-timer
   *             CONFIG_HPET_EMULATE_RTC
-+ *     1.12a   Maciej W. Rozycki: Handle memory-mapped chips properly.
+  *     1.12a   Maciej W. Rozycki: Handle memory-mapped chips properly.
   *     1.12ac  Alan Cox: Allow read access to the day of week register
-  */
- 
--#define RTC_VERSION            "1.12ac"
--
--#define RTC_IO_EXTENT  0x8
-+#define RTC_VERSION            "1.12a"
- 
- /*
-  *     Note that *all* calls to CMOS_READ and CMOS_WRITE are done with
-@@ -338,7 +337,15 @@
-        if (rtc_has_irq == 0)
-                return -EIO;
- 
--       if (count < sizeof(unsigned))
-+       /*
-+        * Historically this function used to assume that sizeof(unsigned long)
-+        * is the same in userspace and kernelspace.  This lead to problems
-+        * for configurations with multiple ABIs such a the MIPS o32 and 64
-+        * ABIs supported on the same kernel.  So now we support read of both
-+        * 4 and 8 bytes and assume that's the sizeof(unsigned long) in the
-+        * userspace ABI.
-+        */
-+       if (count != sizeof(unsigned int) && count !=  sizeof(unsigned long))
-                return -EINVAL;
- 
-        add_wait_queue(&rtc_wait, &wait);
-@@ -369,10 +376,12 @@
-                schedule();
-        } while (1);
- 
--       if (count < sizeof(unsigned long))
--               retval = put_user(data, (unsigned int __user *)buf) ?: sizeof(int); 
-+       if (count == sizeof(unsigned int))
-+               retval = put_user(data, (unsigned int __user *)buf) ?: sizeof(int);
-        else
-                retval = put_user(data, (unsigned long __user *)buf) ?: sizeof(long);
-+       if (!retval)
-+               retval = count;
-  out:
-        current->state = TASK_RUNNING;
-        remove_wait_queue(&rtc_wait, &wait);
-@@ -924,6 +933,9 @@
-        struct sparc_isa_device *isa_dev;
- #endif
- #endif
-+#ifndef __sparc__
-+       void *r;
-+#endif
- 
- #ifdef __sparc__
-        for_each_ebus(ebus) {
-@@ -969,8 +981,13 @@
-        }
- no_irq:
- #else
--       if (!request_region(RTC_PORT(0), RTC_IO_EXTENT, "rtc")) {
--               printk(KERN_ERR "rtc: I/O port %d is not free.\n", RTC_PORT (0));
-+       if (RTC_IOMAPPED)
-+               r = request_region(RTC_PORT(0), RTC_IO_EXTENT, "rtc");
-+       else
-+               r = request_mem_region(RTC_PORT(0), RTC_IO_EXTENT, "rtc");
-+       if (!r) {
-+               printk(KERN_ERR "rtc: I/O resource %lx is not free.\n",
-+                      (long)(RTC_PORT(0)));
-                return -EIO;
-        }
- 
-@@ -984,7 +1001,10 @@
-        if(request_irq(RTC_IRQ, rtc_int_handler_ptr, SA_INTERRUPT, "rtc", NULL)) {
-                /* Yeah right, seeing as irq 8 doesn't even hit the bus. */
-                printk(KERN_ERR "rtc: IRQ %d is not free.\n", RTC_IRQ);
--               release_region(RTC_PORT(0), RTC_IO_EXTENT);
-+               if (RTC_IOMAPPED)
-+                       release_region(RTC_PORT(0), RTC_IO_EXTENT);
-+               else
-+                       release_mem_region(RTC_PORT(0), RTC_IO_EXTENT);
-                return -EIO;
-        }
-        hpet_rtc_timer_init();
-@@ -1084,7 +1104,10 @@
-        if (rtc_has_irq)
-                free_irq (rtc_irq, &rtc_port);
- #else
--       release_region (RTC_PORT (0), RTC_IO_EXTENT);
-+       if (RTC_IOMAPPED)
-+               release_region(RTC_PORT(0), RTC_IO_EXTENT);
-+       else
-+               release_mem_region(RTC_PORT(0), RTC_IO_EXTENT);
- #ifdef RTC_IRQ
-        if (rtc_has_irq)
-                free_irq (RTC_IRQ, NULL);
-diff -Naur linux-2.6.17.13.orig/drivers/char/sb1250_duart.c linux-2.6.17.13/drivers/char/sb1250_duart.c
---- linux-2.6.17.13.orig/drivers/char/sb1250_duart.c    1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/char/sb1250_duart.c 2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,911 @@
+diff -Naur linux-2.6.18/drivers/char/sb1250_duart.c linux-2.6.18.mips/drivers/char/sb1250_duart.c
+--- linux-2.6.18/drivers/char/sb1250_duart.c    1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/char/sb1250_duart.c       2006-09-20 06:55:21.000000000 -0700
+@@ -0,0 +1,910 @@
 +/*
 + * Copyright (C) 2000,2001,2002,2003,2004 Broadcom Corporation
@@ -7137 +6237 @@
 +       sb1250_duart_driver->owner = THIS_MODULE;
 +       sb1250_duart_driver->name = "duart";
-+       sb1250_duart_driver->devfs_name = "duart/";
 +       sb1250_duart_driver->major = TTY_MAJOR;
 +       sb1250_duart_driver->minor_start = SB1250_DUART_MINOR_BASE;
@@ -7283 +6382 @@
 +
 +#endif /* CONFIG_SIBYTE_SB1250_DUART_CONSOLE */
-diff -Naur linux-2.6.17.13.orig/drivers/ide/mips/Makefile linux-2.6.17.13/drivers/ide/mips/Makefile
---- linux-2.6.17.13.orig/drivers/ide/mips/Makefile      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/ide/mips/Makefile   2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/ide/mips/Makefile linux-2.6.18.mips/drivers/ide/mips/Makefile
+--- linux-2.6.18/drivers/ide/mips/Makefile      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/ide/mips/Makefile 2006-09-20 06:55:21.000000000 -0700
 @@ -1,4 +1,4 @@
  obj-$(CONFIG_BLK_DEV_IDE_SWARM)                += swarm.o
@@ -7292 +6391 @@
 -EXTRA_CFLAGS    := -Idrivers/ide
 +CFLAGS_au1xxx-ide.o := -Idrivers/ide
-diff -Naur linux-2.6.17.13.orig/drivers/mtd/devices/docprobe.c linux-2.6.17.13/drivers/mtd/devices/docprobe.c
---- linux-2.6.17.13.orig/drivers/mtd/devices/docprobe.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/mtd/devices/docprobe.c      2006-09-09 10:17:04.000000000 -0700
-@@ -84,10 +84,10 @@
+diff -Naur linux-2.6.18/drivers/mtd/devices/docprobe.c linux-2.6.18.mips/drivers/mtd/devices/docprobe.c
+--- linux-2.6.18/drivers/mtd/devices/docprobe.c 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/mtd/devices/docprobe.c    2006-09-20 06:55:21.000000000 -0700
+@@ -83,10 +83,10 @@
         0xe4000000,
  #elif defined(CONFIG_MOMENCO_OCELOT)
@@ -7309 +6408 @@
  #endif
         0xffffffff };
-diff -Naur linux-2.6.17.13.orig/drivers/mtd/devices/Kconfig linux-2.6.17.13/drivers/mtd/devices/Kconfig
---- linux-2.6.17.13.orig/drivers/mtd/devices/Kconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/mtd/devices/Kconfig 2006-09-09 10:17:04.000000000 -0700
-@@ -47,6 +47,11 @@
-          accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
-          DECsystem 5900 equipped with such a module.
- 
-+         If you want to compile this driver as a module ( = code which can be
-+         inserted in and removed from the running kernel whenever you want),
-+         say M here and read <file:Documentation/modules.txt>.  The module will
-+         be called ms02-nv.o.
-+
- config MTD_DATAFLASH
-        tristate "Support for AT45xxx DataFlash"
-        depends on MTD && SPI_MASTER && EXPERIMENTAL
-diff -Naur linux-2.6.17.13.orig/drivers/mtd/maps/Kconfig linux-2.6.17.13/drivers/mtd/maps/Kconfig
---- linux-2.6.17.13.orig/drivers/mtd/maps/Kconfig       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/mtd/maps/Kconfig    2006-09-09 10:17:04.000000000 -0700
-@@ -200,8 +200,8 @@
-          Support for the flash chip on Tsunami TIG bus.
- 
- config MTD_LASAT
--       tristate "Flash chips on LASAT board"
--       depends on LASAT
-+       tristate "LASAT flash device"
-+       depends on LASAT && MTD_CFI
-        help
-          Support for the flash chips on the Lasat 100 and 200 boards.
- 
+diff -Naur linux-2.6.18/drivers/mtd/maps/Kconfig linux-2.6.18.mips/drivers/mtd/maps/Kconfig
+--- linux-2.6.18/drivers/mtd/maps/Kconfig       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/mtd/maps/Kconfig  2006-09-20 06:55:21.000000000 -0700
 @@ -299,6 +299,18 @@
           Mapping for the Flaga digital module. If you don't have one, ignore
@@ -7357 +6430 @@
         tristate "CFI Flash device mapped on IBM 405LP Beech"
         depends on MTD_CFI && BEECH
-diff -Naur linux-2.6.17.13.orig/drivers/mtd/maps/lasat.c linux-2.6.17.13/drivers/mtd/maps/lasat.c
---- linux-2.6.17.13.orig/drivers/mtd/maps/lasat.c       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/mtd/maps/lasat.c    2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/mtd/maps/lasat.c linux-2.6.18.mips/drivers/mtd/maps/lasat.c
+--- linux-2.6.18/drivers/mtd/maps/lasat.c       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/mtd/maps/lasat.c  2006-09-20 06:55:21.000000000 -0700
 @@ -7,7 +7,7 @@
   * modify it under the terms of the GNU General Public License version
@@ -7369 +6442 @@
   */
  
-@@ -50,7 +50,7 @@
+@@ -49,7 +49,7 @@
         ENABLE_VPP((&lasat_map));
  
@@ -7378 +6451 @@
         lasat_map.size = lasat_board_info.li_flash_size;
  
-diff -Naur linux-2.6.17.13.orig/drivers/net/big_sur_ge.c linux-2.6.17.13/drivers/net/big_sur_ge.c
---- linux-2.6.17.13.orig/drivers/net/big_sur_ge.c       1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/net/big_sur_ge.c    2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/big_sur_ge.c linux-2.6.18.mips/drivers/net/big_sur_ge.c
+--- linux-2.6.18/drivers/net/big_sur_ge.c       1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/net/big_sur_ge.c  2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,2005 @@
 +/*
@@ -9387 +8460 @@
 +MODULE_DESCRIPTION("PMC-Sierra Big Sur Ethernet MAC Driver");
 +MODULE_LICENSE("GPL");
-diff -Naur linux-2.6.17.13.orig/drivers/net/big_sur_ge.h linux-2.6.17.13/drivers/net/big_sur_ge.h
---- linux-2.6.17.13.orig/drivers/net/big_sur_ge.h       1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/net/big_sur_ge.h    2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/big_sur_ge.h linux-2.6.18.mips/drivers/net/big_sur_ge.h
+--- linux-2.6.18/drivers/net/big_sur_ge.h       1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/net/big_sur_ge.h  2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,713 @@
 +/*
@@ -10104 +9177 @@
 +
 +#endif
-diff -Naur linux-2.6.17.13.orig/drivers/net/declance.c linux-2.6.17.13/drivers/net/declance.c
---- linux-2.6.17.13.orig/drivers/net/declance.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/net/declance.c      2006-09-09 10:17:04.000000000 -0700
-@@ -704,8 +704,8 @@
-        return IRQ_HANDLED;
- }
- 
--static irqreturn_t
--lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
-+static irqreturn_t lance_interrupt(const int irq, void *dev_id,
-+                                  struct pt_regs *regs)
- {
-        struct net_device *dev = (struct net_device *) dev_id;
-        struct lance_private *lp = netdev_priv(dev);
-@@ -1255,7 +1255,7 @@
-        return 0;
- 
- err_out_free_dev:
--       kfree(dev);
-+       free_netdev(dev);
- 
- err_out:
-        return ret;
-@@ -1301,6 +1301,7 @@
-        while (root_lance_dev) {
-                struct net_device *dev = root_lance_dev;
-                struct lance_private *lp = netdev_priv(dev);
-+
-                unregister_netdev(dev);
- #ifdef CONFIG_TC
-                if (lp->slot >= 0)
-diff -Naur linux-2.6.17.13.orig/drivers/net/gt64240eth.c linux-2.6.17.13/drivers/net/gt64240eth.c
---- linux-2.6.17.13.orig/drivers/net/gt64240eth.c       1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/net/gt64240eth.c    2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/gt64240eth.c linux-2.6.18.mips/drivers/net/gt64240eth.c
+--- linux-2.6.18/drivers/net/gt64240eth.c       1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/net/gt64240eth.c  2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,1672 @@
 +/*
@@ -11811 +10853 @@
 +       return &gp->stats;
 +}
-diff -Naur linux-2.6.17.13.orig/drivers/net/gt64240eth.h linux-2.6.17.13/drivers/net/gt64240eth.h
---- linux-2.6.17.13.orig/drivers/net/gt64240eth.h       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/net/gt64240eth.h    2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/gt64240eth.h linux-2.6.18.mips/drivers/net/gt64240eth.h
+--- linux-2.6.18/drivers/net/gt64240eth.h       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/net/gt64240eth.h  2006-09-20 06:55:21.000000000 -0700
 @@ -9,6 +9,7 @@
   * Copyright 2000 MontaVista Software Inc.
@@ -11854 +10896 @@
  /* Bit definitions of the SMI Reg */
  enum {
-diff -Naur linux-2.6.17.13.orig/drivers/net/Kconfig linux-2.6.17.13/drivers/net/Kconfig
---- linux-2.6.17.13.orig/drivers/net/Kconfig    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/net/Kconfig 2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/ioc3-eth.c linux-2.6.18.mips/drivers/net/ioc3-eth.c
+--- linux-2.6.18/drivers/net/ioc3-eth.c 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/net/ioc3-eth.c    2006-09-20 06:55:21.000000000 -0700
+@@ -5,7 +5,7 @@
+  *
+  * Driver for SGI's IOC3 based Ethernet cards as found in the PCI card.
+  *
+- * Copyright (C) 1999, 2000, 2001, 2003 Ralf Baechle
++ * Copyright (C) 1999, 2000, 01, 03, 06 Ralf Baechle
+  * Copyright (C) 1995, 1999, 2000, 2001 by Silicon Graphics, Inc.
+  *
+  * References:
+@@ -62,12 +62,7 @@
+ #include <asm/pgtable.h>
+ #include <asm/uaccess.h>
+ #include <asm/sn/types.h>
+-#include <asm/sn/sn0/addrs.h>
+-#include <asm/sn/sn0/hubni.h>
+-#include <asm/sn/sn0/hubio.h>
+-#include <asm/sn/klconfig.h>
+ #include <asm/sn/ioc3.h>
+-#include <asm/sn/sn0/ip27.h>
+ #include <asm/pci/bridge.h>
+ 
+ /*
+@@ -95,6 +90,9 @@
+        u32 emcr, ehar_h, ehar_l;
+        spinlock_t ioc3_lock;
+        struct mii_if_info mii;
++       unsigned long flags;
++#define IOC3_FLAG_RX_CHECKSUMS 1
++
+        struct pci_dev *pdev;
+ 
+        /* Members used by autonegotiation  */
+@@ -522,8 +520,6 @@
+        return &ip->stats;
+ }
+ 
+-#ifdef CONFIG_SGI_IOC3_ETH_HW_RX_CSUM
+-
+ static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
+ {
+        struct ethhdr *eh = eth_hdr(skb);
+@@ -591,7 +587,6 @@
+        if (csum == 0xffff)
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+ }
+-#endif /* CONFIG_SGI_IOC3_ETH_HW_RX_CSUM */
+ 
+ static inline void ioc3_rx(struct ioc3_private *ip)
+ {
+@@ -626,9 +621,9 @@
+                                goto next;
+                        }
+ 
+-#ifdef CONFIG_SGI_IOC3_ETH_HW_RX_CSUM
+-                       ioc3_tcpudp_checksum(skb, w0 & ERXBUF_IPCKSUM_MASK,len);
+-#endif
++                       if (likely(ip->flags & IOC3_FLAG_RX_CHECKSUMS))
++                               ioc3_tcpudp_checksum(skb,
++                                       w0 & ERXBUF_IPCKSUM_MASK, len);
+ 
+                        netif_rx(skb);
+ 
+@@ -1289,9 +1284,7 @@
+        dev->set_multicast_list = ioc3_set_multicast_list;
+        dev->set_mac_address    = ioc3_set_mac_address;
+        dev->ethtool_ops        = &ioc3_ethtool_ops;
+-#ifdef CONFIG_SGI_IOC3_ETH_HW_TX_CSUM
+        dev->features           = NETIF_F_IP_CSUM;
+-#endif
+ 
+        sw_physid1 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID1);
+        sw_physid2 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID2);
+@@ -1378,7 +1371,6 @@
+        uint32_t w0 = 0;
+        int produce;
+ 
+-#ifdef CONFIG_SGI_IOC3_ETH_HW_TX_CSUM
+        /*
+         * IOC3 has a fairly simple minded checksumming hardware which simply
+         * adds up the 1's complement checksum for the entire packet and
+@@ -1426,7 +1418,6 @@
+ 
+                w0 = ETXD_DOCHECKSUM | (csoff << ETXD_CHKOFF_SHIFT);
+        }
+-#endif /* CONFIG_SGI_IOC3_ETH_HW_TX_CSUM */
+ 
+        spin_lock_irq(&ip->ioc3_lock);
+ 
+@@ -1580,12 +1571,37 @@
+        return rc;
+ }
+ 
++static u32 ioc3_get_rx_csum(struct net_device *dev)
++{
++       struct ioc3_private *ip = netdev_priv(dev);
++
++       return ip->flags & IOC3_FLAG_RX_CHECKSUMS;
++}
++
++static int ioc3_set_rx_csum(struct net_device *dev, u32 data)
++{
++       struct ioc3_private *ip = netdev_priv(dev);
++
++       spin_lock_bh(&ip->ioc3_lock);
++       if (data)
++               ip->flags |= IOC3_FLAG_RX_CHECKSUMS;
++       else
++               ip->flags &= ~IOC3_FLAG_RX_CHECKSUMS;
++       spin_unlock_bh(&ip->ioc3_lock);
++
++       return 0;
++}
++
+ static struct ethtool_ops ioc3_ethtool_ops = {
+        .get_drvinfo            = ioc3_get_drvinfo,
+        .get_settings           = ioc3_get_settings,
+        .set_settings           = ioc3_set_settings,
+        .nway_reset             = ioc3_nway_reset,
+        .get_link               = ioc3_get_link,
++       .get_rx_csum            = ioc3_get_rx_csum,
++       .set_rx_csum            = ioc3_set_rx_csum,
++       .get_tx_csum            = ethtool_op_get_tx_csum,
++       .set_tx_csum            = ethtool_op_set_tx_csum
+ };
+ 
+ static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+diff -Naur linux-2.6.18/drivers/net/Kconfig linux-2.6.18.mips/drivers/net/Kconfig
+--- linux-2.6.18/drivers/net/Kconfig    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/net/Kconfig       2006-09-20 06:55:21.000000000 -0700
 @@ -438,6 +438,14 @@
           This is the driver for the onboard card of MIPS Magnum 4000,
@@ -11872 +11043 @@
         bool "MIPS GT96100 Ethernet support"
         depends on NET_ETHERNET && MIPS_GT96100
-@@ -452,10 +460,6 @@
+@@ -453,10 +461,6 @@
           If you have an Alchemy Semi AU1X00 based system
           say Y.  Otherwise, say N.
@@ -11883 +11054 @@
         bool "SGI IOC3 Ethernet"
         depends on NET_ETHERNET && PCI && SGI_IP27
-@@ -494,6 +498,14 @@
-          emulated by the MIPS Simulator.
-          If you are not using a MIPSsim or are unsure, say N.
- 
+@@ -467,25 +471,13 @@
+          the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+ 
+-config SGI_IOC3_ETH_HW_RX_CSUM
+-       bool "Receive hardware checksums"
+-       depends on SGI_IOC3_ETH && INET
+-       default y
+-       help
+-         The SGI IOC3 network adapter supports TCP and UDP checksums in
+-         hardware to offload processing of these checksums from the CPU.  At
+-         the moment only acceleration of IPv4 is supported.  This option
+-         enables offloading for checksums on receive.  If unsure, say Y.
+-
+-config SGI_IOC3_ETH_HW_TX_CSUM
+-       bool "Transmit hardware checksums"
+-       depends on SGI_IOC3_ETH && INET
+-       default y
 +config MIPS_SIM_NET
 +       tristate "MIPS simulator Network device (EXPERIMENTAL)"
 +       depends on NETDEVICES && MIPS_SIM && EXPERIMENTAL
-+       help
+        help
+-         The SGI IOC3 network adapter supports TCP and UDP checksums in
+-         hardware to offload processing of these checksums from the CPU.  At
+-         the moment only acceleration of IPv4 is supported.  This option
+-         enables offloading for checksums on transmit.  If unsure, say Y.
 +         The MIPSNET device is a simple Ethernet network device which is
 +         emulated by the MIPS Simulator.
 +         If you are not using a MIPSsim or are unsure, say N.
-+
- config SGI_O2MACE_ETH
-        tristate "SGI O2 MACE Fast Ethernet support"
-        depends on NET_ETHERNET && SGI_IP32=y
-@@ -1993,6 +2005,10 @@
+ 
+ config MIPS_SIM_NET
+        tristate "MIPS simulator Network device (EXPERIMENTAL)"
+@@ -2035,6 +2027,10 @@
  
           If in doubt, say N.
@@ -11909 +11097 @@
         bool "VLAN support"
         depends on R8169 && VLAN_8021Q
-@@ -2195,8 +2211,8 @@
+@@ -2266,8 +2262,8 @@
         select MII
         help
@@ -11920 +11108 @@
  config MV643XX_ETH_0
         bool "MV-643XX Port 0"
-@@ -2219,6 +2235,20 @@
+@@ -2290,6 +2286,20 @@
           This enables support for Port 2 of the Marvell MV643XX Gigabit
           Ethernet.
@@ -11941 +11129 @@
  
  #
-diff -Naur linux-2.6.17.13.orig/drivers/net/Makefile linux-2.6.17.13/drivers/net/Makefile
---- linux-2.6.17.13.orig/drivers/net/Makefile   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/net/Makefile        2006-09-09 10:17:04.000000000 -0700
-@@ -111,6 +111,11 @@
+diff -Naur linux-2.6.18/drivers/net/Makefile linux-2.6.18.mips/drivers/net/Makefile
+--- linux-2.6.18/drivers/net/Makefile   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/net/Makefile      2006-09-20 06:55:21.000000000 -0700
+@@ -114,6 +114,11 @@
  
  obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
@@ -11956 +11144 @@
  obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
  obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
-diff -Naur linux-2.6.17.13.orig/drivers/net/sb1250-mac.c linux-2.6.17.13/drivers/net/sb1250-mac.c
---- linux-2.6.17.13.orig/drivers/net/sb1250-mac.c       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/net/sb1250-mac.c    2006-09-09 10:17:04.000000000 -0700
-@@ -156,6 +156,10 @@
- 
- #define NUMCACHEBLKS(x) (((x)+SMP_CACHE_BYTES-1)/SMP_CACHE_BYTES)
- 
-+#define SBMAC_READCSR(t)       __raw_readq((unsigned long)t)
-+#define SBMAC_WRITECSR(t,v)    __raw_writeq(v, (unsigned long)t)
-+
-+
- #define SBMAC_MAX_TXDESCR      32
- #define SBMAC_MAX_RXDESCR      32
- 
-@@ -2416,6 +2420,11 @@
-                        sc->sbm_dev->name);
-        }
- 
-+       if (periph_rev >= 2) {
-+               printk(KERN_INFO "%s: enabling TCP rcv checksum\n",
-+                       sc->sbm_dev->name);
-+       }
-+
-        /*
-         * Display Ethernet address (this is called during the config
-         * process so we need to finish off the config message that
-diff -Naur linux-2.6.17.13.orig/drivers/net/titan_ge.c linux-2.6.17.13/drivers/net/titan_ge.c
---- linux-2.6.17.13.orig/drivers/net/titan_ge.c 1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/net/titan_ge.c      2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/titan_ge.c linux-2.6.18.mips/drivers/net/titan_ge.c
+--- linux-2.6.18/drivers/net/titan_ge.c 1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/net/titan_ge.c    2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,2071 @@
 +/*
@@ -14057 +13219 @@
 +module_init(titan_ge_init_module);
 +module_exit(titan_ge_cleanup_module);
-diff -Naur linux-2.6.17.13.orig/drivers/net/titan_ge.h linux-2.6.17.13/drivers/net/titan_ge.h
---- linux-2.6.17.13.orig/drivers/net/titan_ge.h 1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/net/titan_ge.h      2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/titan_ge.h linux-2.6.18.mips/drivers/net/titan_ge.h
+--- linux-2.6.18/drivers/net/titan_ge.h 1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/net/titan_ge.h    2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,417 @@
 +#ifndef _TITAN_GE_H_
@@ -14478 +13640 @@
 +#endif                                 /* _TITAN_GE_H_ */
 +
-diff -Naur linux-2.6.17.13.orig/drivers/net/titan_mdio.c linux-2.6.17.13/drivers/net/titan_mdio.c
---- linux-2.6.17.13.orig/drivers/net/titan_mdio.c       1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/net/titan_mdio.c    2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/titan_mdio.c linux-2.6.18.mips/drivers/net/titan_mdio.c
+--- linux-2.6.18/drivers/net/titan_mdio.c       1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/net/titan_mdio.c  2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,217 @@
 +/*
@@ -14699 +13861 @@
 +}
 +
-diff -Naur linux-2.6.17.13.orig/drivers/net/titan_mdio.h linux-2.6.17.13/drivers/net/titan_mdio.h
---- linux-2.6.17.13.orig/drivers/net/titan_mdio.h       1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/net/titan_mdio.h    2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/net/titan_mdio.h linux-2.6.18.mips/drivers/net/titan_mdio.h
+--- linux-2.6.18/drivers/net/titan_mdio.h       1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/net/titan_mdio.h  2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,56 @@
 +/*
@@ -14759 +13921 @@
 +
 +#endif /* _TITAN_MDIO_H */
-diff -Naur linux-2.6.17.13.orig/drivers/scsi/dec_esp.c linux-2.6.17.13/drivers/scsi/dec_esp.c
---- linux-2.6.17.13.orig/drivers/scsi/dec_esp.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/scsi/dec_esp.c      2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/scsi/dec_esp.c linux-2.6.18.mips/drivers/scsi/dec_esp.c
+--- linux-2.6.18/drivers/scsi/dec_esp.c 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/scsi/dec_esp.c    2006-09-20 06:55:21.000000000 -0700
 @@ -55,7 +55,7 @@
  
@@ -14780 +13942 @@
                         esp->dregs = 0;
                         esp->eregs = (void *)CKSEG1ADDR(mem_start +
-diff -Naur linux-2.6.17.13.orig/drivers/scsi/NCR53C9x.h linux-2.6.17.13/drivers/scsi/NCR53C9x.h
---- linux-2.6.17.13.orig/drivers/scsi/NCR53C9x.h        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/scsi/NCR53C9x.h     2006-09-09 10:17:04.000000000 -0700
-@@ -145,12 +145,7 @@
+diff -Naur linux-2.6.18/drivers/scsi/NCR53C9x.h linux-2.6.18.mips/drivers/scsi/NCR53C9x.h
+--- linux-2.6.18/drivers/scsi/NCR53C9x.h        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/scsi/NCR53C9x.h   2006-09-20 06:55:21.000000000 -0700
+@@ -144,12 +144,7 @@
  
  #ifndef MULTIPLE_PAD_SIZES
@@ -14797 +13959 @@
  
  struct ESP_regs {
-diff -Naur linux-2.6.17.13.orig/drivers/scsi/sgiwd93.c linux-2.6.17.13/drivers/scsi/sgiwd93.c
---- linux-2.6.17.13.orig/drivers/scsi/sgiwd93.c 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/scsi/sgiwd93.c      2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/scsi/sgiwd93.c linux-2.6.18.mips/drivers/scsi/sgiwd93.c
+--- linux-2.6.18/drivers/scsi/sgiwd93.c 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/scsi/sgiwd93.c    2006-09-20 06:55:21.000000000 -0700
 @@ -14,6 +14,7 @@
  #include <linux/interrupt.h>
@@ -14816 +13978 @@
  static inline void init_hpc_chain(struct hpc_data *hd)
  {
-diff -Naur linux-2.6.17.13.orig/drivers/serial/ip22zilog.c linux-2.6.17.13/drivers/serial/ip22zilog.c
---- linux-2.6.17.13.orig/drivers/serial/ip22zilog.c     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/serial/ip22zilog.c  2006-09-09 10:17:04.000000000 -0700
-@@ -866,6 +866,7 @@
+diff -Naur linux-2.6.18/drivers/serial/ip22zilog.c linux-2.6.18.mips/drivers/serial/ip22zilog.c
+--- linux-2.6.18/drivers/serial/ip22zilog.c     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/serial/ip22zilog.c        2006-09-20 06:55:21.000000000 -0700
+@@ -865,6 +865,7 @@
         up->cflag = termios->c_cflag;
  
@@ -14827 +13989 @@
         spin_unlock_irqrestore(&up->port.lock, flags);
  }
-@@ -1027,6 +1028,8 @@
+@@ -1026,6 +1027,8 @@
         }
  
@@ -14836 +13998 @@
  
  static int __init ip22zilog_console_setup(struct console *con, char *options)
-diff -Naur linux-2.6.17.13.orig/drivers/serial/ip3106_uart.c linux-2.6.17.13/drivers/serial/ip3106_uart.c
---- linux-2.6.17.13.orig/drivers/serial/ip3106_uart.c   1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/serial/ip3106_uart.c        2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/serial/ip3106_uart.c linux-2.6.18.mips/drivers/serial/ip3106_uart.c
+--- linux-2.6.18/drivers/serial/ip3106_uart.c   1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/serial/ip3106_uart.c      2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,912 @@
 +/*
@@ -15752 +14914 @@
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_IP3106_MAJOR);
-diff -Naur linux-2.6.17.13.orig/drivers/serial/Kconfig linux-2.6.17.13/drivers/serial/Kconfig
---- linux-2.6.17.13.orig/drivers/serial/Kconfig 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/serial/Kconfig      2006-09-09 10:17:04.000000000 -0700
-@@ -647,6 +647,25 @@
+diff -Naur linux-2.6.18/drivers/serial/Kconfig linux-2.6.18.mips/drivers/serial/Kconfig
+--- linux-2.6.18/drivers/serial/Kconfig 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/serial/Kconfig    2006-09-20 06:55:21.000000000 -0700
+@@ -651,6 +651,25 @@
         depends on SERIAL_SH_SCI=y
         select SERIAL_CORE_CONSOLE
@@ -15781 +14943 @@
         tristate
  
-diff -Naur linux-2.6.17.13.orig/drivers/serial/Makefile linux-2.6.17.13/drivers/serial/Makefile
---- linux-2.6.17.13.orig/drivers/serial/Makefile        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/serial/Makefile     2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/serial/Makefile linux-2.6.18.mips/drivers/serial/Makefile
+--- linux-2.6.18/drivers/serial/Makefile        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/serial/Makefile   2006-09-20 06:55:21.000000000 -0700
 @@ -39,6 +39,7 @@
  obj-$(CONFIG_V850E_UART) += v850e_uart.o
@@ -15792 +14954 @@
  obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o
  obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o
-diff -Naur linux-2.6.17.13.orig/drivers/usb/gadget/net2280.c linux-2.6.17.13/drivers/usb/gadget/net2280.c
---- linux-2.6.17.13.orig/drivers/usb/gadget/net2280.c   2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/usb/gadget/net2280.c        2006-09-09 10:17:04.000000000 -0700
-@@ -468,7 +468,8 @@
+diff -Naur linux-2.6.18/drivers/usb/gadget/net2280.c linux-2.6.18.mips/drivers/usb/gadget/net2280.c
+--- linux-2.6.18/drivers/usb/gadget/net2280.c   2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/usb/gadget/net2280.c      2006-09-20 06:55:21.000000000 -0700
+@@ -467,7 +467,8 @@
  #elif  defined(CONFIG_PPC) && !defined(CONFIG_NOT_COHERENT_CACHE)
  #define USE_KMALLOC
@@ -15805 +14967 @@
  
  /* FIXME there are other cases, including an x86-64 one ...  */
-diff -Naur linux-2.6.17.13.orig/drivers/usb/host/ohci-hcd.c linux-2.6.17.13/drivers/usb/host/ohci-hcd.c
---- linux-2.6.17.13.orig/drivers/usb/host/ohci-hcd.c    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/usb/host/ohci-hcd.c 2006-09-09 10:17:04.000000000 -0700
-@@ -906,6 +906,10 @@
+diff -Naur linux-2.6.18/drivers/usb/host/ohci-hcd.c linux-2.6.18.mips/drivers/usb/host/ohci-hcd.c
+--- linux-2.6.18/drivers/usb/host/ohci-hcd.c    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/usb/host/ohci-hcd.c       2006-09-20 06:55:21.000000000 -0700
+@@ -909,6 +909,10 @@
  #include "ohci-au1xxx.c"
  #endif
@@ -15819 +14981 @@
  #include "ohci-ppc-soc.c"
  #endif
-diff -Naur linux-2.6.17.13.orig/drivers/usb/host/ohci-pnx8550.c linux-2.6.17.13/drivers/usb/host/ohci-pnx8550.c
---- linux-2.6.17.13.orig/drivers/usb/host/ohci-pnx8550.c        1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/usb/host/ohci-pnx8550.c     2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/drivers/usb/host/ohci-pnx8550.c linux-2.6.18.mips/drivers/usb/host/ohci-pnx8550.c
+--- linux-2.6.18/drivers/usb/host/ohci-pnx8550.c        1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/usb/host/ohci-pnx8550.c   2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,277 @@
 +/*
@@ -16100 +15262 @@
 +module_init (ohci_hcd_pnx8550_init);
 +module_exit (ohci_hcd_pnx8550_cleanup);
-diff -Naur linux-2.6.17.13.orig/drivers/video/au1100fb.c linux-2.6.17.13/drivers/video/au1100fb.c
---- linux-2.6.17.13.orig/drivers/video/au1100fb.c       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/video/au1100fb.c    2006-09-09 10:17:04.000000000 -0700
-@@ -38,6 +38,7 @@
+diff -Naur linux-2.6.18/drivers/video/au1100fb.c linux-2.6.18.mips/drivers/video/au1100fb.c
+--- linux-2.6.18/drivers/video/au1100fb.c       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/video/au1100fb.c  2006-09-20 06:55:21.000000000 -0700
+@@ -40,6 +40,7 @@
   *  with this program; if not, write  to the Free Software Foundation, Inc.,
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   */
 +
- #include <linux/config.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
-diff -Naur linux-2.6.17.13.orig/drivers/video/Kconfig linux-2.6.17.13/drivers/video/Kconfig
---- linux-2.6.17.13.orig/drivers/video/Kconfig  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/video/Kconfig       2006-09-09 10:17:04.000000000 -0700
-@@ -1142,6 +1142,17 @@
+ #include <linux/errno.h>
+diff -Naur linux-2.6.18/drivers/video/Kconfig linux-2.6.18.mips/drivers/video/Kconfig
+--- linux-2.6.18/drivers/video/Kconfig  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/video/Kconfig     2006-09-20 06:55:21.000000000 -0700
+@@ -1250,6 +1250,17 @@
           Please read the <file:Documentation/fb/README-sstfb.txt> for supported
           options and other important info  support.
@@ -16132 +15294 @@
         tristate "Cyberblade/i1 support"
         depends on FB && PCI && X86_32 && !64BIT
-@@ -1206,7 +1217,25 @@
+@@ -1314,7 +1325,25 @@
  
  config FB_AU1100
@@ -16159 +15321 @@
  config FB_AU1200
         bool "Au1200 LCD Driver"
-@@ -1322,8 +1351,8 @@
+@@ -1430,8 +1459,8 @@
         select FB_CFB_IMAGEBLIT
         help
@@ -16170 +15332 @@
  config FB_MAXINE
         bool "Maxine (Personal DECstation) onboard framebuffer support"
-diff -Naur linux-2.6.17.13.orig/drivers/video/Makefile linux-2.6.17.13/drivers/video/Makefile
---- linux-2.6.17.13.orig/drivers/video/Makefile 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/drivers/video/Makefile      2006-09-09 10:17:04.000000000 -0700
-@@ -93,6 +93,7 @@
+diff -Naur linux-2.6.18/drivers/video/Makefile linux-2.6.18.mips/drivers/video/Makefile
+--- linux-2.6.18/drivers/video/Makefile 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/drivers/video/Makefile    2006-09-20 06:55:21.000000000 -0700
+@@ -95,6 +95,7 @@
  obj-$(CONFIG_FB_TX3912)                  += tx3912fb.o
  obj-$(CONFIG_FB_S1D13XXX)        += s1d13xxxfb.o
@@ -16179 +15341 @@
 +obj-$(CONFIG_FB_SMIVGX)                  += smivgxfb.o
  obj-$(CONFIG_FB_S3C2410)         += s3c2410fb.o
- 
- # Platform or fallback drivers go here
-diff -Naur linux-2.6.17.13.orig/drivers/video/smivgxfb.c linux-2.6.17.13/drivers/video/smivgxfb.c
---- linux-2.6.17.13.orig/drivers/video/smivgxfb.c       1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/drivers/video/smivgxfb.c    2006-09-09 10:17:04.000000000 -0700
+ obj-$(CONFIG_FB_PNX4008_DUM)     += pnx4008/
+ obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pnx4008/
+diff -Naur linux-2.6.18/drivers/video/smivgxfb.c linux-2.6.18.mips/drivers/video/smivgxfb.c
+--- linux-2.6.18/drivers/video/smivgxfb.c       1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/drivers/video/smivgxfb.c  2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,387 @@
 +/***************************************************************************
@@ -16572 +15734 @@
 +MODULE_DESCRIPTION("Framebuffer driver for SMI Voyager");
 +MODULE_LICENSE("GPL");
-diff -Naur linux-2.6.17.13.orig/.gitignore linux-2.6.17.13/.gitignore
---- linux-2.6.17.13.orig/.gitignore     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/.gitignore  2006-09-09 10:17:04.000000000 -0700
-@@ -30,6 +30,12 @@
- include/linux/autoconf.h
- include/linux/compile.h
- include/linux/version.h
-+include/asm-*/asm-offsets.h
- 
- # stgit generated dirs
- patches-*
-+
-+#
-+# Quilt
-+#
-+patches
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/asmmacro-32.h linux-2.6.17.13/include/asm-mips/asmmacro-32.h
---- linux-2.6.17.13.orig/include/asm-mips/asmmacro-32.h 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/asmmacro-32.h      2006-09-09 10:17:04.000000000 -0700
-@@ -12,7 +12,7 @@
- #include <asm/fpregdef.h>
- #include <asm/mipsregs.h>
- 
--       .macro  fpu_save_double thread status tmp1=t0 tmp2
-+       .macro  fpu_save_double thread status tmp1=t0
-        cfc1    \tmp1,  fcr31
-        sdc1    $f0,  THREAD_FPR0(\thread)
-        sdc1    $f2,  THREAD_FPR2(\thread)
-@@ -70,7 +70,7 @@
-        sw      \tmp, THREAD_FCR31(\thread)
-        .endm
- 
--       .macro  fpu_restore_double thread tmp=t0
-+       .macro  fpu_restore_double thread status tmp=t0
-        lw      \tmp, THREAD_FCR31(\thread)
-        ldc1    $f0,  THREAD_FPR0(\thread)
-        ldc1    $f2,  THREAD_FPR2(\thread)
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/asmmacro-64.h linux-2.6.17.13/include/asm-mips/asmmacro-64.h
---- linux-2.6.17.13.orig/include/asm-mips/asmmacro-64.h 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/asmmacro-64.h      2006-09-09 10:17:04.000000000 -0700
-@@ -53,12 +53,12 @@
-        sdc1    $f31, THREAD_FPR31(\thread)
-        .endm
- 
--       .macro  fpu_save_double thread status tmp1 tmp2
--       sll     \tmp2, \tmp1, 5
--       bgez    \tmp2, 2f
-+       .macro  fpu_save_double thread status tmp
-+       sll     \tmp, \status, 5
-+       bgez    \tmp, 2f
-        fpu_save_16odd \thread
- 2:
--       fpu_save_16even \thread \tmp1                   # clobbers t1
-+       fpu_save_16even \thread \tmp
-        .endm
- 
-        .macro  fpu_restore_16even thread tmp=t0
-@@ -101,13 +101,12 @@
-        ldc1    $f31, THREAD_FPR31(\thread)
-        .endm
- 
--       .macro  fpu_restore_double thread tmp
--       mfc0    t0, CP0_STATUS
--       sll     t1, t0, 5
--       bgez    t1, 1f                          # 16 register mode?
-+       .macro  fpu_restore_double thread status tmp
-+       sll     \tmp, \status, 5
-+       bgez    \tmp, 1f                                # 16 register mode?
- 
--       fpu_restore_16odd a0
--1:     fpu_restore_16even a0, t0               # clobbers t0
-+       fpu_restore_16odd \thread
-+1:     fpu_restore_16even \thread \tmp
-        .endm
- 
-        .macro  cpu_save_nonscratch thread
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/asmmacro.h linux-2.6.17.13/include/asm-mips/asmmacro.h
---- linux-2.6.17.13.orig/include/asm-mips/asmmacro.h    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/asmmacro.h 2006-09-09 10:17:04.000000000 -0700
-@@ -27,14 +27,14 @@
-        ori     \reg, \reg, TCSTATUS_IXMT
-        xori    \reg, \reg, TCSTATUS_IXMT
-        mtc0    \reg, CP0_TCSTATUS
--       ehb
-+       _ehb
-        .endm
- 
-        .macro  local_irq_disable reg=t0
-        mfc0    \reg, CP0_TCSTATUS
-        ori     \reg, \reg, TCSTATUS_IXMT
-        mtc0    \reg, CP0_TCSTATUS
--       ehb
-+       _ehb
-        .endm
- #else
-        .macro  local_irq_enable reg=t0
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/cacheflush.h linux-2.6.17.13/include/asm-mips/cacheflush.h
---- linux-2.6.17.13.orig/include/asm-mips/cacheflush.h  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/cacheflush.h       2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/include/asm-mips/cacheflush.h linux-2.6.18.mips/include/asm-mips/cacheflush.h
+--- linux-2.6.18/include/asm-mips/cacheflush.h  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/cacheflush.h     2006-09-20 06:55:21.000000000 -0700
 @@ -21,7 +21,6 @@
   *  - flush_cache_range(vma, start, end) flushes a range of pages
@@ -16729 +15795 @@
  extern void (*flush_cache_sigtramp)(unsigned long addr);
  extern void (*flush_icache_all)(void);
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/cpu-features.h linux-2.6.17.13/include/asm-mips/cpu-features.h
---- linux-2.6.17.13.orig/include/asm-mips/cpu-features.h        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/cpu-features.h     2006-09-09 10:17:04.000000000 -0700
-@@ -144,12 +144,8 @@
- #define cpu_has_dsp            (cpu_data[0].ases & MIPS_ASE_DSP)
- #endif
- 
--#ifdef CONFIG_MIPS_MT
- #ifndef cpu_has_mipsmt
--# define cpu_has_mipsmt                (cpu_data[0].ases & MIPS_ASE_MIPSMT)
--#endif
--#else
--# define cpu_has_mipsmt                0
-+#define cpu_has_mipsmt         (cpu_data[0].ases & MIPS_ASE_MIPSMT)
- #endif
- 
- #ifdef CONFIG_32BIT
-@@ -188,19 +184,15 @@
- # endif
- #endif
- 
--#ifdef CONFIG_CPU_MIPSR2
--# if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint)
--#  define cpu_has_vint         (cpu_data[0].options & MIPS_CPU_VINT)
--# else
--#  define cpu_has_vint                 0
--# endif
--# if defined(CONFIG_CPU_MIPSR2_IRQ_EI) && !defined(cpu_has_veic)
--#  define cpu_has_veic         (cpu_data[0].options & MIPS_CPU_VEIC)
--# else
--#  define cpu_has_veic                 0
--# endif
--#else
-+#if defined(CONFIG_CPU_MIPSR2_IRQ_VI) && !defined(cpu_has_vint)
-+# define cpu_has_vint          (cpu_data[0].options & MIPS_CPU_VINT)
-+#elif !defined(cpu_has_vint)
- # define cpu_has_vint                  0
-+#endif
-+
-+#if defined(CONFIG_CPU_MIPSR2_IRQ_EI) && !defined(cpu_has_veic)
-+# define cpu_has_veic          (cpu_data[0].options & MIPS_CPU_VEIC)
-+#elif !defined(cpu_has_veic)
- # define cpu_has_veic                  0
- #endif
- 
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/fixmap.h linux-2.6.17.13/include/asm-mips/fixmap.h
---- linux-2.6.17.13.orig/include/asm-mips/fixmap.h      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/fixmap.h   2006-09-09 10:17:04.000000000 -0700
-@@ -46,8 +46,16 @@
+diff -Naur linux-2.6.18/include/asm-mips/fixmap.h linux-2.6.18.mips/include/asm-mips/fixmap.h
+--- linux-2.6.18/include/asm-mips/fixmap.h      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/fixmap.h 2006-09-20 06:55:21.000000000 -0700
+@@ -45,8 +45,16 @@
   * fix-mapped?
   */
@@ -16795 +15816 @@
  #endif
         __end_of_fixed_addresses
-@@ -70,7 +78,7 @@
-  * the start of the fixmap, and leave one page empty
+@@ -70,9 +78,9 @@
   * at the top of mem..
   */
+ #if defined(CONFIG_CPU_TX39XX) || defined(CONFIG_CPU_TX49XX)
+-#define FIXADDR_TOP    (0xff000000UL - 0x2000)
++#define FIXADDR_TOP    ((unsigned long)(long)(int)(0xff000000 - 0x20000))
+ #else
 -#define FIXADDR_TOP    (0xffffe000UL)
-+#define FIXADDR_TOP    ((unsigned long)(long)(int)0xfffe0000)
++#define FIXADDR_TOP    ((unsigned long)(long)(int)0xfffe0000)
+ #endif
  #define FIXADDR_SIZE   (__end_of_fixed_addresses << PAGE_SHIFT)
  #define FIXADDR_START  (FIXADDR_TOP - FIXADDR_SIZE)
- 
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/futex.h linux-2.6.17.13/include/asm-mips/futex.h
---- linux-2.6.17.13.orig/include/asm-mips/futex.h       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/futex.h    2006-09-09 10:17:04.000000000 -0700
-@@ -22,51 +22,53 @@
-                "       .set    push                            \n"     \
-                "       .set    noat                            \n"     \
-                "       .set    mips3                           \n"     \
--               "1:     ll      %1, (%3)        # __futex_atomic_op     \n" \
-+               "1:     ll      %1, %4  # __futex_atomic_op     \n"     \
-                "       .set    mips0                           \n"     \
-                "       " insn  "                               \n"     \
-                "       .set    mips3                           \n"     \
--               "2:     sc      $1, (%3)                        \n"     \
-+               "2:     sc      $1, %2                          \n"     \
-                "       beqzl   $1, 1b                          \n"     \
-                __FUTEX_SMP_SYNC                                        \
-                "3:                                             \n"     \
-                "       .set    pop                             \n"     \
-                "       .set    mips0                           \n"     \
-                "       .section .fixup,\"ax\"                  \n"     \
--               "4:     li      %0, %5                          \n"     \
-+               "4:     li      %0, %6                          \n"     \
-                "       j       2b                              \n"     \
-                "       .previous                               \n"     \
-                "       .section __ex_table,\"a\"               \n"     \
-                "       "__UA_ADDR "\t1b, 4b                    \n"     \
-                "       "__UA_ADDR "\t2b, 4b                    \n"     \
-                "       .previous                               \n"     \
--               : "=r" (ret), "=r" (oldval)                             \
--               : "0" (0), "r" (uaddr), "Jr" (oparg), "i" (-EFAULT));   \
-+               : "=r" (ret), "=&r" (oldval), "=R" (*uaddr)             \
-+               : "0" (0), "R" (*uaddr), "Jr" (oparg), "i" (-EFAULT)    \
-+               : "memory");                                            \
-        } else if (cpu_has_llsc) {                                      \
-                __asm__ __volatile__(                                   \
-                "       .set    push                            \n"     \
-                "       .set    noat                            \n"     \
-                "       .set    mips3                           \n"     \
--               "1:     ll      %1, (%3)        # __futex_atomic_op     \n" \
-+               "1:     ll      %1, %4  # __futex_atomic_op     \n"     \
-                "       .set    mips0                           \n"     \
-                "       " insn  "                               \n"     \
-                "       .set    mips3                           \n"     \
--               "2:     sc      $1, (%3)                        \n"     \
-+               "2:     sc      $1, %2                          \n"     \
-                "       beqz    $1, 1b                          \n"     \
-                __FUTEX_SMP_SYNC                                        \
-                "3:                                             \n"     \
-                "       .set    pop                             \n"     \
-                "       .set    mips0                           \n"     \
-                "       .section .fixup,\"ax\"                  \n"     \
--               "4:     li      %0, %5                          \n"     \
-+               "4:     li      %0, %6                          \n"     \
-                "       j       2b                              \n"     \
-                "       .previous                               \n"     \
-                "       .section __ex_table,\"a\"               \n"     \
-                "       "__UA_ADDR "\t1b, 4b                    \n"     \
-                "       "__UA_ADDR "\t2b, 4b                    \n"     \
-                "       .previous                               \n"     \
--               : "=r" (ret), "=r" (oldval)                             \
--               : "0" (0), "r" (uaddr), "Jr" (oparg), "i" (-EFAULT));   \
-+               : "=r" (ret), "=&r" (oldval), "=R" (*uaddr)             \
-+               : "0" (0), "R" (*uaddr), "Jr" (oparg), "i" (-EFAULT)    \
-+               : "memory");                                            \
-        } else                                                          \
-                ret = -ENOSYS;                                          \
- }
-@@ -89,23 +91,23 @@
- 
-        switch (op) {
-        case FUTEX_OP_SET:
--               __futex_atomic_op("move $1, %z4", ret, oldval, uaddr, oparg);
-+               __futex_atomic_op("move $1, %z5", ret, oldval, uaddr, oparg);
-                break;
- 
-        case FUTEX_OP_ADD:
--               __futex_atomic_op("addu $1, %1, %z4",
-+               __futex_atomic_op("addu $1, %1, %z5",
-                                  ret, oldval, uaddr, oparg);
-                break;
-        case FUTEX_OP_OR:
--               __futex_atomic_op("or   $1, %1, %z4",
-+               __futex_atomic_op("or   $1, %1, %z5",
-                                  ret, oldval, uaddr, oparg);
-                break;
-        case FUTEX_OP_ANDN:
--               __futex_atomic_op("and  $1, %1, %z4",
-+               __futex_atomic_op("and  $1, %1, %z5",
-                                  ret, oldval, uaddr, ~oparg);
-                break;
-        case FUTEX_OP_XOR:
--               __futex_atomic_op("xor  $1, %1, %z4",
-+               __futex_atomic_op("xor  $1, %1, %z5",
-                                  ret, oldval, uaddr, oparg);
-                break;
-        default:
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/hazards.h linux-2.6.17.13/include/asm-mips/hazards.h
---- linux-2.6.17.13.orig/include/asm-mips/hazards.h     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/hazards.h  2006-09-09 10:17:04.000000000 -0700
-@@ -70,10 +70,10 @@
-  * Use a macro for ehb unless explicit support for MIPSR2 is enabled
-  */
- 
--#define irq_enable_hazard
-+#define irq_enable_hazard                                              \
-        _ehb
- 
--#define irq_disable_hazard
-+#define irq_disable_hazard                                             \
-        _ehb
- 
- #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000)
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/inst.h linux-2.6.17.13/include/asm-mips/inst.h
---- linux-2.6.17.13.orig/include/asm-mips/inst.h        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/inst.h     2006-09-09 10:17:04.000000000 -0700
-@@ -74,7 +74,7 @@
-        ins_op, dinsm_op, dinsu_op, dins_op,
-        bshfl_op = 0x20,
-        dbshfl_op = 0x24,
--       rdhwr_op = 0x3f
-+       rdhwr_op = 0x3b
- };
- 
- /*
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/io.h linux-2.6.17.13/include/asm-mips/io.h
---- linux-2.6.17.13.orig/include/asm-mips/io.h  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/io.h       2006-09-09 10:17:04.000000000 -0700
-@@ -519,34 +519,6 @@
+diff -Naur linux-2.6.18/include/asm-mips/io.h linux-2.6.18.mips/include/asm-mips/io.h
+--- linux-2.6.18/include/asm-mips/io.h  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/io.h     2006-09-20 06:55:21.000000000 -0700
+@@ -518,34 +518,6 @@
  }
  
@@ -16966 +15866 @@
   * to explicitly ioremap() it. The fact that the ISA IO space is mapped
   * to PAGE_OFFSET is pure coincidence - it does not mean ISA values
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/irq.h linux-2.6.17.13/include/asm-mips/irq.h
---- linux-2.6.17.13.orig/include/asm-mips/irq.h 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/irq.h      2006-09-09 10:17:04.000000000 -0700
-@@ -77,4 +77,8 @@
+diff -Naur linux-2.6.18/include/asm-mips/irq.h linux-2.6.18.mips/include/asm-mips/irq.h
+--- linux-2.6.18/include/asm-mips/irq.h 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/irq.h    2006-09-20 06:55:21.000000000 -0700
+@@ -76,8 +76,4 @@
                            unsigned long hwmask);
  #endif /* CONFIG_MIPS_MT_SMTC */
  
-+#ifdef CONFIG_SMP
-+#define ARCH_HAS_IRQ_PER_CPU
-+#endif
-+
+-#ifdef CONFIG_SMP
+-#define ARCH_HAS_IRQ_PER_CPU
+-#endif
+-
  #endif /* _ASM_IRQ_H */
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-2.6.17.13/include/asm-mips/mach-au1x00/au1xxx_ide.h
---- linux-2.6.17.13.orig/include/asm-mips/mach-au1x00/au1xxx_ide.h      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/mach-au1x00/au1xxx_ide.h   2006-09-09 10:17:04.000000000 -0700
-@@ -84,6 +84,7 @@
+diff -Naur linux-2.6.18/include/asm-mips/Kbuild linux-2.6.18.mips/include/asm-mips/Kbuild
+--- linux-2.6.18/include/asm-mips/Kbuild        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/Kbuild   2006-09-20 06:55:21.000000000 -0700
+@@ -1 +1,3 @@
+ include include/asm-generic/Kbuild.asm
++
++header-y += sgidefs.h
+diff -Naur linux-2.6.18/include/asm-mips/mach-atlas/mc146818rtc.h linux-2.6.18.mips/include/asm-mips/mach-atlas/mc146818rtc.h
+--- linux-2.6.18/include/asm-mips/mach-atlas/mc146818rtc.h      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/mach-atlas/mc146818rtc.h 2006-09-20 06:55:21.000000000 -0700
+@@ -28,10 +28,12 @@
+ #include <asm/mips-boards/atlas.h>
+ #include <asm/mips-boards/atlasint.h>
+ 
++#define ARCH_RTC_LOCATION
++
+ #define RTC_PORT(x)    (ATLAS_RTC_ADR_REG + (x) * 8)
+ #define RTC_IO_EXTENT  0x100
+ #define RTC_IOMAPPED   0
+-#define RTC_IRQ                ATLASINT_RTC
++#define RTC_IRQ                ATLAS_INT_RTC
+ 
+ static inline unsigned char CMOS_READ(unsigned long addr)
+ {
+diff -Naur linux-2.6.18/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-2.6.18.mips/include/asm-mips/mach-au1x00/au1xxx_ide.h
+--- linux-2.6.18/include/asm-mips/mach-au1x00/au1xxx_ide.h      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-09-20 06:55:21.000000000 -0700
+@@ -83,6 +83,7 @@
  } _auide_hwif;
  
@@ -16989 +15913 @@
  static const struct drive_list_entry dma_white_list [] = {
  /*
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/mach-mips/irq.h linux-2.6.17.13/include/asm-mips/mach-mips/irq.h
---- linux-2.6.17.13.orig/include/asm-mips/mach-mips/irq.h       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/mach-mips/irq.h    2006-09-09 10:17:04.000000000 -0700
-@@ -5,10 +5,4 @@
- 
- #define NR_IRQS        256
- 
--#ifdef CONFIG_SMP
--
--#define ARCH_HAS_IRQ_PER_CPU
--
--#endif
--
- #endif /* __ASM_MACH_MIPS_IRQ_H */
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/mach-vr41xx/timex.h linux-2.6.17.13/include/asm-mips/mach-vr41xx/timex.h
---- linux-2.6.17.13.orig/include/asm-mips/mach-vr41xx/timex.h   1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/include/asm-mips/mach-vr41xx/timex.h        2006-09-09 10:17:04.000000000 -0700
-@@ -0,0 +1,18 @@
+diff -Naur linux-2.6.18/include/asm-mips/mips-boards/atlasint.h linux-2.6.18.mips/include/asm-mips/mips-boards/atlasint.h
+--- linux-2.6.18/include/asm-mips/mips-boards/atlasint.h        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/mips-boards/atlasint.h   2006-09-20 06:55:21.000000000 -0700
+@@ -1,6 +1,7 @@
+ /*
+- * Carsten Langgaard, carstenl@mips.com
+- * Copyright (C) 1999 MIPS Technologies, Inc.  All rights reserved.
++ * Copyright (C) 1999, 2006  MIPS Technologies, Inc.  All rights reserved.
++ *     Authors: Carsten Langgaard <carstenl@mips.com>
++ *              Maciej W. Rozycki <macro@mips.com>
+  *
+  * ########################################################################
+  *
+@@ -25,41 +26,88 @@
+ #ifndef _MIPS_ATLASINT_H
+ #define _MIPS_ATLASINT_H
+ 
+-#define ATLASINT_BASE          1
+-#define ATLASINT_UART          (ATLASINT_BASE+0)
+-#define ATLASINT_TIM0          (ATLASINT_BASE+1)
+-#define ATLASINT_RES2          (ATLASINT_BASE+2)
+-#define ATLASINT_RES3          (ATLASINT_BASE+3)
+-#define ATLASINT_RTC           (ATLASINT_BASE+4)
+-#define ATLASINT_COREHI                (ATLASINT_BASE+5)
+-#define ATLASINT_CORELO                (ATLASINT_BASE+6)
+-#define ATLASINT_RES7          (ATLASINT_BASE+7)
+-#define ATLASINT_PCIA          (ATLASINT_BASE+8)
+-#define ATLASINT_PCIB          (ATLASINT_BASE+9)
+-#define ATLASINT_PCIC          (ATLASINT_BASE+10)
+-#define ATLASINT_PCID          (ATLASINT_BASE+11)
+-#define ATLASINT_ENUM          (ATLASINT_BASE+12)
+-#define ATLASINT_DEG           (ATLASINT_BASE+13)
+-#define ATLASINT_ATXFAIL       (ATLASINT_BASE+14)
+-#define ATLASINT_INTA          (ATLASINT_BASE+15)
+-#define ATLASINT_INTB          (ATLASINT_BASE+16)
+-#define ATLASINT_ETH           ATLASINT_INTB
+-#define ATLASINT_INTC          (ATLASINT_BASE+17)
+-#define ATLASINT_SCSI          ATLASINT_INTC
+-#define ATLASINT_INTD          (ATLASINT_BASE+18)
+-#define ATLASINT_SERR          (ATLASINT_BASE+19)
+-#define ATLASINT_RES20         (ATLASINT_BASE+20)
+-#define ATLASINT_RES21         (ATLASINT_BASE+21)
+-#define ATLASINT_RES22         (ATLASINT_BASE+22)
+-#define ATLASINT_RES23         (ATLASINT_BASE+23)
+-#define ATLASINT_RES24         (ATLASINT_BASE+24)
+-#define ATLASINT_RES25         (ATLASINT_BASE+25)
+-#define ATLASINT_RES26         (ATLASINT_BASE+26)
+-#define ATLASINT_RES27         (ATLASINT_BASE+27)
+-#define ATLASINT_RES28         (ATLASINT_BASE+28)
+-#define ATLASINT_RES29         (ATLASINT_BASE+29)
+-#define ATLASINT_RES30         (ATLASINT_BASE+30)
+-#define ATLASINT_RES31         (ATLASINT_BASE+31)
+-#define ATLASINT_END           (ATLASINT_BASE+31)
 +/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2003 by Ralf Baechle
++ * Interrupts 0..7 are used for Atlas CPU interrupts (nonEIC mode)
 + */
++#define MIPSCPU_INT_BASE       0
++
++/* CPU interrupt offsets */
++#define MIPSCPU_INT_SW0                0
++#define MIPSCPU_INT_SW1                1
++#define MIPSCPU_INT_MB0                2
++#define MIPSCPU_INT_ATLAS      MIPSCPU_INT_MB0
++#define MIPSCPU_INT_MB1                3
++#define MIPSCPU_INT_MB2                4
++#define MIPSCPU_INT_MB3                5
++#define MIPSCPU_INT_MB4                6
++#define MIPSCPU_INT_CPUCTR     7
++
 +/*
-+ * Changes:
-+ *  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
-+ *  - CLOCK_TICK_RATE is changed into 32768 from 6144000.
++ * Interrupts 8..39 are used for Atlas interrupt controller interrupts
 + */
-+#ifndef __ASM_MACH_VR41XX_TIMEX_H
-+#define __ASM_MACH_VR41XX_TIMEX_H
-+
-+#define CLOCK_TICK_RATE                32768
-+
-+#endif /* __ASM_MACH_VR41XX_TIMEX_H */
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/mipsregs.h linux-2.6.17.13/include/asm-mips/mipsregs.h
---- linux-2.6.17.13.orig/include/asm-mips/mipsregs.h    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/mipsregs.h 2006-09-09 10:17:04.000000000 -0700
-@@ -1462,7 +1462,8 @@
- static inline void __ehb(void)
- {
-        __asm__ __volatile__(
--       "       ehb                                                     \n");
-+       "       .set    mips32r2                                        \n"
-+       "       ehb                                                     \n"             "       .set    mips0                                           \n");
- }
- 
- /*
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/mman.h linux-2.6.17.13/include/asm-mips/mman.h
---- linux-2.6.17.13.orig/include/asm-mips/mman.h        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/mman.h     2006-09-09 10:17:04.000000000 -0700
-@@ -75,4 +75,13 @@
- #define MAP_ANON       MAP_ANONYMOUS
- #define MAP_FILE       0
- 
-+#ifdef __KERNEL__
-+
-+#define arch_mmap_check mips_mmap_check
-+
-+extern int mips_mmap_check(unsigned long addr, unsigned long len,
-+       unsigned long flags);
-+
-+#endif
-+
- #endif /* _ASM_MMAN_H */
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/page.h linux-2.6.17.13/include/asm-mips/page.h
---- linux-2.6.17.13.orig/include/asm-mips/page.h        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/page.h     2006-09-09 10:17:04.000000000 -0700
-@@ -58,19 +58,17 @@
++#define ATLAS_INT_BASE         8
++#define ATLAS_INT_UART         (ATLAS_INT_BASE + 0)
++#define ATLAS_INT_TIM0         (ATLAS_INT_BASE + 1)
++#define ATLAS_INT_RES2         (ATLAS_INT_BASE + 2)
++#define ATLAS_INT_RES3         (ATLAS_INT_BASE + 3)
++#define ATLAS_INT_RTC          (ATLAS_INT_BASE + 4)
++#define ATLAS_INT_COREHI       (ATLAS_INT_BASE + 5)
++#define ATLAS_INT_CORELO       (ATLAS_INT_BASE + 6)
++#define ATLAS_INT_RES7         (ATLAS_INT_BASE + 7)
++#define ATLAS_INT_PCIA         (ATLAS_INT_BASE + 8)
++#define ATLAS_INT_PCIB         (ATLAS_INT_BASE + 9)
++#define ATLAS_INT_PCIC         (ATLAS_INT_BASE + 10)
++#define ATLAS_INT_PCID         (ATLAS_INT_BASE + 11)
++#define ATLAS_INT_ENUM         (ATLAS_INT_BASE + 12)
++#define ATLAS_INT_DEG          (ATLAS_INT_BASE + 13)
++#define ATLAS_INT_ATXFAIL      (ATLAS_INT_BASE + 14)
++#define ATLAS_INT_INTA         (ATLAS_INT_BASE + 15)
++#define ATLAS_INT_INTB         (ATLAS_INT_BASE + 16)
++#define ATLAS_INT_ETH          ATLAS_INT_INTB
++#define ATLAS_INT_INTC         (ATLAS_INT_BASE + 17)
++#define ATLAS_INT_SCSI         ATLAS_INT_INTC
++#define ATLAS_INT_INTD         (ATLAS_INT_BASE + 18)
++#define ATLAS_INT_SERR         (ATLAS_INT_BASE + 19)
++#define ATLAS_INT_RES20                (ATLAS_INT_BASE + 20)
++#define ATLAS_INT_RES21                (ATLAS_INT_BASE + 21)
++#define ATLAS_INT_RES22                (ATLAS_INT_BASE + 22)
++#define ATLAS_INT_RES23                (ATLAS_INT_BASE + 23)
++#define ATLAS_INT_RES24                (ATLAS_INT_BASE + 24)
++#define ATLAS_INT_RES25                (ATLAS_INT_BASE + 25)
++#define ATLAS_INT_RES26                (ATLAS_INT_BASE + 26)
++#define ATLAS_INT_RES27                (ATLAS_INT_BASE + 27)
++#define ATLAS_INT_RES28                (ATLAS_INT_BASE + 28)
++#define ATLAS_INT_RES29                (ATLAS_INT_BASE + 29)
++#define ATLAS_INT_RES30                (ATLAS_INT_BASE + 30)
++#define ATLAS_INT_RES31                (ATLAS_INT_BASE + 31)
++#define ATLAS_INT_END          (ATLAS_INT_BASE + 31)
++
++/*
++ * Interrupts 64..127 are used for Soc-it Classic interrupts
++ */
++#define MSC01C_INT_BASE                64
++
++/* SOC-it Classic interrupt offsets */
++#define MSC01C_INT_TMR         0
++#define MSC01C_INT_PCI         1
++
++/*
++ * Interrupts 64..127 are used for Soc-it EIC interrupts
++ */
++#define MSC01E_INT_BASE                64
++
++/* SOC-it EIC interrupt offsets */
++#define        MSC01E_INT_SW0          1
++#define        MSC01E_INT_SW1          2
++#define        MSC01E_INT_MB0          3
++#define        MSC01E_INT_ATLAS        MSC01E_INT_MB0
++#define        MSC01E_INT_MB1          4
++#define        MSC01E_INT_MB2          5
++#define        MSC01E_INT_MB3          6
++#define        MSC01E_INT_MB4          7
++#define        MSC01E_INT_TMR          8
++#define        MSC01E_INT_PCI          9
++#define        MSC01E_INT_PERFCTR      10
++#define        MSC01E_INT_CPUCTR       11
+ 
+ #endif /* !(_MIPS_ATLASINT_H) */
+diff -Naur linux-2.6.18/include/asm-mips/page.h linux-2.6.18.mips/include/asm-mips/page.h
+--- linux-2.6.18/include/asm-mips/page.h        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/page.h   2006-09-20 06:55:21.000000000 -0700
+@@ -53,19 +53,17 @@
         extern void (*flush_data_cache_page)(unsigned long addr);
  
@@ -17085 +16081 @@
  /*
   * These are used to make use of C type-checking..
-@@ -79,15 +77,17 @@
+@@ -74,15 +72,17 @@
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -17104 +16100 @@
  /*
   * For 3-level pagetables we defines these ourselves, for 2-level the
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/smp.h linux-2.6.17.13/include/asm-mips/smp.h
---- linux-2.6.17.13.orig/include/asm-mips/smp.h 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/smp.h      2006-09-09 10:17:04.000000000 -0700
-@@ -114,4 +114,33 @@
- 
- #endif /* CONFIG_SMP */
- 
-+int smp_call_function(void(*func)(void *info), void *info, int retry, int wait);
-+
-+/*
-+ * Special Variant of smp_call_function for use by cache functions:
-+ *
-+ *  o No return value
-+ *  o collapses to normal function call on UP kernels
-+ *  o collapses to normal function call on systems with a single shared
-+ *    primary cache.
-+ *  o Both CONFIG_MIPS_MT_SMP and CONFIG_MIPS_MT_SMTC currently imply there
-+ *    is only one physical core.
-+ */
-+static inline void __on_other_cores(void (*func) (void *info), void *info)
-+{
-+#if !defined(CONFIG_MIPS_MT_SMP) && !defined(CONFIG_MIPS_MT_SMTC)
-+       smp_call_function(func, info, 1, 1);
-+#endif
-+}
-+
-+static inline void __on_each_core(void (*func) (void *info), void *info)
-+{
-+       preempt_disable();
-+
-+       __on_other_cores(func, info);
-+       func(info);
-+
-+       preempt_enable();
-+}
-+
- #endif /* __ASM_SMP_H */
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/spinlock.h linux-2.6.17.13/include/asm-mips/spinlock.h
---- linux-2.6.17.13.orig/include/asm-mips/spinlock.h    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/spinlock.h 2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/include/asm-mips/ptrace.h linux-2.6.18.mips/include/asm-mips/ptrace.h
+--- linux-2.6.18/include/asm-mips/ptrace.h      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/ptrace.h 2006-09-20 06:55:21.000000000 -0700
+@@ -10,8 +10,6 @@
+ #define _ASM_PTRACE_H
+ 
+ 
+-#include <asm/isadep.h>
+-
+ /* 0 - 31 are integer registers, 32 - 63 are fp registers.  */
+ #define FPR_BASE       32
+ #define PC             64
+@@ -73,6 +71,7 @@
+ #ifdef __KERNEL__
+ 
+ #include <linux/linkage.h>
++#include <asm/isadep.h>
+ 
+ /*
+  * Does the process account for user or for system time?
+diff -Naur linux-2.6.18/include/asm-mips/spinlock.h linux-2.6.18.mips/include/asm-mips/spinlock.h
+--- linux-2.6.18/include/asm-mips/spinlock.h    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/spinlock.h       2006-09-20 06:55:21.000000000 -0700
 @@ -239,7 +239,51 @@
         : "memory");
@@ -17203 +16182 @@
 +
  #endif /* _ASM_SPINLOCK_H */
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/stackframe.h linux-2.6.17.13/include/asm-mips/stackframe.h
---- linux-2.6.17.13.orig/include/asm-mips/stackframe.h  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/stackframe.h       2006-09-09 10:17:04.000000000 -0700
-@@ -305,7 +305,7 @@
-                mfc0    v0, CP0_TCSTATUS
-                ori     v0, TCSTATUS_IXMT
-                mtc0    v0, CP0_TCSTATUS
--               ehb
-+               _ehb
-                DMT     5                               # dmt a1
-                jal     mips_ihb
- #endif /* CONFIG_MIPS_MT_SMTC */
-@@ -326,14 +326,14 @@
-  * restore TCStatus.IXMT.
-  */
-                LONG_L  v1, PT_TCSTATUS(sp)
--               ehb
-+               _ehb
-                mfc0    v0, CP0_TCSTATUS
-                andi    v1, TCSTATUS_IXMT
-                /* We know that TCStatua.IXMT should be set from above */
-                xori    v0, v0, TCSTATUS_IXMT
-                or      v0, v0, v1
-                mtc0    v0, CP0_TCSTATUS
--               ehb
-+               _ehb
-                andi    a1, a1, VPECONTROL_TE
-                beqz    a1, 1f
-                emt
-@@ -412,7 +412,7 @@
-                /* Clear TKSU, leave IXMT */
-                xori    t0, 0x00001800
-                mtc0    t0, CP0_TCSTATUS
--               ehb
-+               _ehb
-                /* We need to leave the global IE bit set, but clear EXL...*/
-                mfc0    t0, CP0_STATUS
-                ori     t0, ST0_EXL | ST0_ERL
-@@ -439,7 +439,7 @@
-                 * and enable interrupts only for the
-                 * current TC, using the TCStatus register.
-                 */
--               ehb
-+               _ehb
-                mfc0    t0,CP0_TCSTATUS
-                /* Fortunately CU 0 is in the same place in both registers */
-                /* Set TCU0, TKSU (for later inversion) and IXMT */
-@@ -448,7 +448,7 @@
-                /* Clear TKSU *and* IXMT */
-                xori    t0, 0x00001c00
-                mtc0    t0, CP0_TCSTATUS
--               ehb
-+               _ehb
-                /* We need to leave the global IE bit set, but clear EXL...*/
-                mfc0    t0, CP0_STATUS
-                ori     t0, ST0_EXL
-@@ -480,7 +480,7 @@
-                andi    v1, v0, TCSTATUS_IXMT
-                ori     v0, TCSTATUS_IXMT
-                mtc0    v0, CP0_TCSTATUS
--               ehb
-+               _ehb
-                DMT     2                               # dmt   v0
-                /*
-                 * We don't know a priori if ra is "live"
-@@ -496,7 +496,7 @@
-                xori    t0, 0x1e
-                mtc0    t0, CP0_STATUS
- #ifdef CONFIG_MIPS_MT_SMTC
--               ehb
-+               _ehb
-                andi    v0, v0, VPECONTROL_TE
-                beqz    v0, 2f
-                nop     /* delay slot */
-diff -Naur linux-2.6.17.13.orig/include/asm-mips/unistd.h linux-2.6.17.13/include/asm-mips/unistd.h
---- linux-2.6.17.13.orig/include/asm-mips/unistd.h      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/asm-mips/unistd.h   2006-09-09 10:17:04.000000000 -0700
-@@ -326,16 +326,21 @@
- #define __NR_unshare                   (__NR_Linux + 303)
- #define __NR_splice                    (__NR_Linux + 304)
- #define __NR_sync_file_range           (__NR_Linux + 305)
-+#define __NR_tee                       (__NR_Linux + 306)
-+#define __NR_vmsplice                  (__NR_Linux + 307)
-+#define __NR_move_pages                        (__NR_Linux + 308)
+diff -Naur linux-2.6.18/include/asm-mips/timex.h linux-2.6.18.mips/include/asm-mips/timex.h
+--- linux-2.6.18/include/asm-mips/timex.h       2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/timex.h  2006-09-20 06:55:21.000000000 -0700
+@@ -8,6 +8,8 @@
+ #ifndef _ASM_TIMEX_H
+ #define _ASM_TIMEX_H
+ 
++#ifdef __KERNEL__
++
+ #include <asm/mipsregs.h>
+ 
+ /*
+@@ -51,4 +53,6 @@
+        return read_c0_count();
+ }
+ 
++#endif /* __KERNEL__ */
++
+ #endif /*  _ASM_TIMEX_H */
+diff -Naur linux-2.6.18/include/asm-mips/unistd.h linux-2.6.18.mips/include/asm-mips/unistd.h
+--- linux-2.6.18/include/asm-mips/unistd.h      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/unistd.h 2006-09-20 06:55:21.000000000 -0700
+@@ -329,16 +329,18 @@
+ #define __NR_tee                       (__NR_Linux + 306)
+ #define __NR_vmsplice                  (__NR_Linux + 307)
+ #define __NR_move_pages                        (__NR_Linux + 308)
 +#define __NR_set_robust_list           (__NR_Linux + 309)
 +#define __NR_get_robust_list           (__NR_Linux + 310)
@@ -17293 +16214 @@
   * Offset of the last Linux o32 flavoured syscall
   */
--#define __NR_Linux_syscalls            305
+-#define __NR_Linux_syscalls            308
 +#define __NR_Linux_syscalls            310
  
@@ -17299 +16220 @@
  
  #define __NR_O32_Linux                 4000
--#define __NR_O32_Linux_syscalls                305
+-#define __NR_O32_Linux_syscalls                308
 +#define __NR_O32_Linux_syscalls                310
  
  #if _MIPS_SIM == _MIPS_SIM_ABI64
  
-@@ -608,16 +613,21 @@
- #define __NR_unshare                   (__NR_Linux + 262)
- #define __NR_splice                    (__NR_Linux + 263)
- #define __NR_sync_file_range           (__NR_Linux + 264)
-+#define __NR_tee                       (__NR_Linux + 265)
-+#define __NR_vmsplice                  (__NR_Linux + 266)
-+#define __NR_move_pages                        (__NR_Linux + 267)
+@@ -614,16 +616,18 @@
+ #define __NR_tee                       (__NR_Linux + 265)
+ #define __NR_vmsplice                  (__NR_Linux + 266)
+ #define __NR_move_pages                        (__NR_Linux + 267)
 +#define __NR_set_robust_list           (__NR_Linux + 268)
 +#define __NR_get_robust_list           (__NR_Linux + 269)
@@ -17317 +16235 @@
   * Offset of the last Linux 64-bit flavoured syscall
   */
--#define __NR_Linux_syscalls            264
+-#define __NR_Linux_syscalls            267
 +#define __NR_Linux_syscalls            269
  
@@ -17323 +16241 @@
  
  #define __NR_64_Linux                  5000
--#define __NR_64_Linux_syscalls         264
+-#define __NR_64_Linux_syscalls         267
 +#define __NR_64_Linux_syscalls         269
  
  #if _MIPS_SIM == _MIPS_SIM_NABI32
  
-@@ -894,16 +904,21 @@
- #define __NR_unshare                   (__NR_Linux + 266)
- #define __NR_splice                    (__NR_Linux + 267)
- #define __NR_sync_file_range           (__NR_Linux + 268)
-+#define __NR_tee                       (__NR_Linux + 269)
-+#define __NR_vmsplice                  (__NR_Linux + 270)
-+#define __NR_move_pages                        (__NR_Linux + 271)
+@@ -903,16 +907,18 @@
+ #define __NR_tee                       (__NR_Linux + 269)
+ #define __NR_vmsplice                  (__NR_Linux + 270)
+ #define __NR_move_pages                        (__NR_Linux + 271)
 +#define __NR_set_robust_list           (__NR_Linux + 272)
 +#define __NR_get_robust_list           (__NR_Linux + 273)
@@ -17341 +16256 @@
   * Offset of the last N32 flavoured syscall
   */
--#define __NR_Linux_syscalls            268
+-#define __NR_Linux_syscalls            271
 +#define __NR_Linux_syscalls            273
  
@@ -17347 +16262 @@
  
  #define __NR_N32_Linux                 6000
--#define __NR_N32_Linux_syscalls                268
+-#define __NR_N32_Linux_syscalls                271
 +#define __NR_N32_Linux_syscalls                273
  
- #ifndef __ASSEMBLY__
- 
-diff -Naur linux-2.6.17.13.orig/include/linux/elf.h linux-2.6.17.13/include/linux/elf.h
---- linux-2.6.17.13.orig/include/linux/elf.h    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/linux/elf.h 2006-09-09 10:17:04.000000000 -0700
-@@ -67,7 +67,7 @@
- 
- #define EM_MIPS                8       /* MIPS R3000 (officially, big-endian only) */
- 
--#define EM_MIPS_RS4_BE 10      /* MIPS R4000 big-endian */
-+#define EM_MIPS_RS3_LE 10      /* MIPS R3000 little-endian */
- 
- #define EM_PARISC      15      /* HPPA */
- 
-diff -Naur linux-2.6.17.13.orig/include/linux/highmem.h linux-2.6.17.13/include/linux/highmem.h
---- linux-2.6.17.13.orig/include/linux/highmem.h        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/linux/highmem.h     2006-09-09 10:17:04.000000000 -0700
-@@ -90,7 +90,10 @@
+ #ifdef __KERNEL__
+ 
+diff -Naur linux-2.6.18/include/asm-mips/user.h linux-2.6.18.mips/include/asm-mips/user.h
+--- linux-2.6.18/include/asm-mips/user.h        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/asm-mips/user.h   2006-09-20 06:55:21.000000000 -0700
+@@ -8,6 +8,8 @@
+ #ifndef _ASM_USER_H
+ #define _ASM_USER_H
+ 
++#ifdef __KERNEL__
++
+ #include <asm/page.h>
+ #include <asm/reg.h>
+ 
+@@ -55,4 +57,6 @@
+ #define HOST_DATA_START_ADDR   (u.start_data)
+ #define HOST_STACK_END_ADDR    (u.start_stack + u.u_ssize * NBPG)
+ 
++#endif /* __KERNEL__ */
++
+ #endif /* _ASM_USER_H */
+diff -Naur linux-2.6.18/include/linux/highmem.h linux-2.6.18.mips/include/linux/highmem.h
+--- linux-2.6.18/include/linux/highmem.h        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/linux/highmem.h   2006-09-20 06:55:21.000000000 -0700
+@@ -89,7 +89,10 @@
         kunmap_atomic(kaddr, KM_USER0);
  }
@@ -17379 +16301 @@
         char *vfrom, *vto;
  
-@@ -103,6 +106,8 @@
+@@ -102,6 +105,8 @@
         smp_wmb();
  }
@@ -17388 +16310 @@
  {
         char *vfrom, *vto;
-diff -Naur linux-2.6.17.13.orig/include/linux/mc146818rtc.h linux-2.6.17.13/include/linux/mc146818rtc.h
---- linux-2.6.17.13.orig/include/linux/mc146818rtc.h    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/linux/mc146818rtc.h 2006-09-09 10:17:04.000000000 -0700
-@@ -89,4 +89,12 @@
- # define RTC_VRT 0x80          /* valid RAM and time */
- /**********************************************************************/
- 
-+#ifndef RTC_IO_EXTENT
-+#define RTC_IO_EXTENT  0x8
-+#endif
-+
-+#ifndef RTC_IOMAPPED
-+#define RTC_IOMAPPED   1       /* Default to I/O mapping. */
-+#endif
-+
- #endif /* _MC146818RTC_H */
-diff -Naur linux-2.6.17.13.orig/include/linux/pci_ids.h linux-2.6.17.13/include/linux/pci_ids.h
---- linux-2.6.17.13.orig/include/linux/pci_ids.h        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/linux/pci_ids.h     2006-09-09 10:17:04.000000000 -0700
-@@ -1572,6 +1572,9 @@
+diff -Naur linux-2.6.18/include/linux/pci_ids.h linux-2.6.18.mips/include/linux/pci_ids.h
+--- linux-2.6.18/include/linux/pci_ids.h        2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/linux/pci_ids.h   2006-09-20 06:55:21.000000000 -0700
+@@ -1603,6 +1603,9 @@
  #define PCI_VENDOR_ID_SATSAGEM         0x1267
  #define PCI_DEVICE_ID_SATSAGEM_NICCY   0x1016
@@ -17417 +16323 @@
  #define PCI_VENDOR_ID_ENSONIQ          0x1274
  #define PCI_DEVICE_ID_ENSONIQ_CT5880   0x5880
-diff -Naur linux-2.6.17.13.orig/include/linux/serial.h linux-2.6.17.13/include/linux/serial.h
---- linux-2.6.17.13.orig/include/linux/serial.h 2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/linux/serial.h      2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/include/linux/serial.h linux-2.6.18.mips/include/linux/serial.h
+--- linux-2.6.18/include/linux/serial.h 2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/linux/serial.h    2006-09-20 06:55:21.000000000 -0700
 @@ -76,7 +76,8 @@
  #define PORT_16654     11
@@ -17430 +16336 @@
  #define SERIAL_IO_PORT 0
  #define SERIAL_IO_HUB6 1
-diff -Naur linux-2.6.17.13.orig/include/linux/serial_ip3106.h linux-2.6.17.13/include/linux/serial_ip3106.h
---- linux-2.6.17.13.orig/include/linux/serial_ip3106.h  2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/include/linux/serial_ip3106.h       2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/include/linux/serial_ip3106.h linux-2.6.18.mips/include/linux/serial_ip3106.h
+--- linux-2.6.18/include/linux/serial_ip3106.h  2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/include/linux/serial_ip3106.h     2006-09-20 06:55:21.000000000 -0700
 @@ -78,4 +78,16 @@
  #define IP3106_UART_FIFO_RXFIFO                0x00001F00
@@ -17450 +16356 @@
 +
  #endif
-diff -Naur linux-2.6.17.13.orig/Makefile linux-2.6.17.13/Makefile
---- linux-2.6.17.13.orig/Makefile       2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/Makefile    2006-09-09 10:17:04.000000000 -0700
-@@ -148,10 +148,7 @@
- # then ARCH is assigned, getting whatever value it gets normally, and 
- # SUBARCH is subsequently ignored.
- 
--SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
--                                 -e s/arm.*/arm/ -e s/sa110/arm/ \
--                                 -e s/s390x/s390/ -e s/parisc64/parisc/ \
--                                 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
-+SUBARCH := mips
- 
- # Cross compiling and selecting different set of gcc/bin-utils
- # ---------------------------------------------------------------------------
-diff -Naur linux-2.6.17.13.orig/mm/memory.c linux-2.6.17.13/mm/memory.c
---- linux-2.6.17.13.orig/mm/memory.c    2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/mm/memory.c 2006-09-09 10:17:04.000000000 -0700
-@@ -1394,7 +1394,8 @@
+diff -Naur linux-2.6.18/mm/memory.c linux-2.6.18.mips/mm/memory.c
+--- linux-2.6.18/mm/memory.c    2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/mm/memory.c       2006-09-20 06:55:21.000000000 -0700
+@@ -1407,7 +1407,7 @@
         return pte;
  }
  
 -static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va)
-+static inline void cow_user_page(struct page *dst, struct page *src,
-+       unsigned long va, struct vm_area_struct *vma)
++static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va, struct vm_area_struct *vma)
  {
         /*
          * If the source page was a PFN mapping, we don't have
-@@ -1418,7 +1419,7 @@
+@@ -1429,9 +1429,9 @@
+                        memset(kaddr, 0, PAGE_SIZE);
+                kunmap_atomic(kaddr, KM_USER0);
                 return;
-                
+-               
++
         }
 -       copy_user_highpage(dst, src, va);
@@ -17487 +16380 @@
  
  /*
-@@ -1483,7 +1484,7 @@
+@@ -1531,7 +1531,7 @@
                 new_page = alloc_page_vma(GFP_HIGHUSER, vma, address);
                 if (!new_page)
@@ -17496 +16389 @@
  
         /*
-@@ -2082,7 +2083,7 @@
-                page = alloc_page_vma(GFP_HIGHUSER, vma, address);
-                if (!page)
-                        goto oom;
--               copy_user_highpage(page, new_page, address);
-+               copy_user_highpage(page, new_page, address, vma);
-                page_cache_release(new_page);
-                new_page = page;
-                anon = 1;
-diff -Naur linux-2.6.17.13.orig/sound/oss/au1550_ac97.c linux-2.6.17.13/sound/oss/au1550_ac97.c
---- linux-2.6.17.13.orig/sound/oss/au1550_ac97.c        2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/sound/oss/au1550_ac97.c     2006-09-09 10:17:04.000000000 -0700
-@@ -60,6 +60,7 @@
- #include <asm/mach-au1x00/au1000.h>
- #include <asm/mach-au1x00/au1xxx_psc.h>
- #include <asm/mach-au1x00/au1xxx_dbdma.h>
-+#include <asm/mach-pb1x00/pb1550.h>
- 
- #undef OSS_DOCUMENTED_MIXER_SEMANTICS
- 
-diff -Naur linux-2.6.17.13.orig/sound/oss/au1550_i2s.c linux-2.6.17.13/sound/oss/au1550_i2s.c
---- linux-2.6.17.13.orig/sound/oss/au1550_i2s.c 1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.6.17.13/sound/oss/au1550_i2s.c      2006-09-09 10:17:04.000000000 -0700
+@@ -2135,7 +2135,7 @@
+                        page = alloc_page_vma(GFP_HIGHUSER, vma, address);
+                        if (!page)
+                                goto oom;
+-                       copy_user_highpage(page, new_page, address);
++                       copy_user_highpage(page, new_page, address, vma);
+                        page_cache_release(new_page);
+                        new_page = page;
+                        anon = 1;
+diff -Naur linux-2.6.18/sound/oss/au1550_i2s.c linux-2.6.18.mips/sound/oss/au1550_i2s.c
+--- linux-2.6.18/sound/oss/au1550_i2s.c 1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.18.mips/sound/oss/au1550_i2s.c    2006-09-20 06:55:21.000000000 -0700
 @@ -0,0 +1,2029 @@
 +/*
@@ -19549 +18431 @@
 +MODULE_AUTHOR("Advanced Micro Devices (AMD), dan@embeddededge.com");
 +MODULE_DESCRIPTION("Au1550 I2S Audio Driver");
-diff -Naur linux-2.6.17.13.orig/sound/oss/Kconfig linux-2.6.17.13/sound/oss/Kconfig
---- linux-2.6.17.13.orig/sound/oss/Kconfig      2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/sound/oss/Kconfig   2006-09-09 10:17:04.000000000 -0700
-@@ -117,6 +117,10 @@
-        tristate "Au1550 AC97 Sound"
-        depends on SOUND_PRIME && SOC_AU1550
+diff -Naur linux-2.6.18/sound/oss/Kconfig linux-2.6.18.mips/sound/oss/Kconfig
+--- linux-2.6.18/sound/oss/Kconfig      2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/sound/oss/Kconfig 2006-09-20 06:55:21.000000000 -0700
+@@ -132,6 +132,10 @@
+        select SND_AC97_CODEC
+        depends on SOUND_PRIME && (SOC_AU1550 || SOC_AU1200)
  
 +config SOUND_AU1550_I2S
@@ -19563 +18445 @@
         tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
         depends on SOUND_PRIME && PCI
-diff -Naur linux-2.6.17.13.orig/sound/oss/Makefile linux-2.6.17.13/sound/oss/Makefile
---- linux-2.6.17.13.orig/sound/oss/Makefile     2006-09-08 20:23:25.000000000 -0700
-+++ linux-2.6.17.13/sound/oss/Makefile  2006-09-09 10:17:04.000000000 -0700
+diff -Naur linux-2.6.18/sound/oss/Makefile linux-2.6.18.mips/sound/oss/Makefile
+--- linux-2.6.18/sound/oss/Makefile     2006-09-19 20:42:06.000000000 -0700
++++ linux-2.6.18.mips/sound/oss/Makefile        2006-09-20 06:55:21.000000000 -0700
 @@ -66,6 +66,7 @@
  obj-$(CONFIG_SOUND_VRC5477)    += nec_vrc5477.o ac97_codec.o
@@ -19574 +18456 @@
  obj-$(CONFIG_SOUND_FUSION)     += cs46xx.o ac97_codec.o
  obj-$(CONFIG_SOUND_MAESTRO)    += maestro.o
-