106 files changed, 2886 insertions, 4493 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index aae16cdfe30..dba9390d37c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1931,6 +1931,7 @@ config MIPS_MT_SMP
        select SYS_SUPPORTS_SCHED_SMT if SMP
        select SYS_SUPPORTS_SMP
        select SMP_UP
+        select MIPS_PERF_SHARED_TC_COUNTERS
        help
          This is a kernel model which is known a VSMP but lately has been
          marketesed into SMVP.
@@ -2041,16 +2042,6 @@ config MIPS_VPE_APSP_API
        depends on MIPS_VPE_LOADER
        help
-config MIPS_APSP_KSPD
-        bool "Enable KSPD"
-        depends on MIPS_VPE_APSP_API
-        default y
-        help
-          KSPD is a kernel daemon that accepts syscall requests from the SP
-          side, actions them and returns the results. It also handles the
-          "exit" syscall notifying other kernel modules the SP program is
-          exiting.  You probably want to say yes here.
 config MIPS_CMP
        bool "MIPS CMP framework support"
        depends on SYS_SUPPORTS_MIPS_CMP
@@ -2280,6 +2271,9 @@ config NR_CPUS
          performance should round up your number of processors to the next
          power of two.
+config MIPS_PERF_SHARED_TC_COUNTERS
+        bool
 #
 # Timer Interrupt Frequency Configuration
 #
diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 0faaab24376..c8862bdc2ff 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -27,7 +27,7 @@ config MIPS_MTX1
        select SYS_HAS_EARLY_PRINTK
 config MIPS_DB1000
-        bool "Alchemy DB1000/DB1500/DB1100 boards"
+        bool "Alchemy DB1000/DB1500/DB1100 PB1500/1100 boards"
        select ALCHEMY_GPIOINT_AU1000
        select DMA_NONCOHERENT
        select HW_HAS_PCI
@@ -36,57 +36,15 @@ config MIPS_DB1000
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_HAS_EARLY_PRINTK
-config MIPS_DB1200
+config MIPS_DB1235
-        bool "Alchemy DB1200/PB1200 board"
+        bool "Alchemy DB1200/PB1200/DB1300/DB1550/PB1550 boards"
-        select ALCHEMY_GPIOINT_AU1000
+        select ARCH_REQUIRE_GPIOLIB
-        select DMA_COHERENT
-        select MIPS_DISABLE_OBSOLETE_IDE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-config MIPS_DB1300
-        bool "NetLogic DB1300 board"
-        select ALCHEMY_GPIOINT_AU1300
-        select DMA_COHERENT
-        select MIPS_DISABLE_OBSOLETE_IDE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-config MIPS_DB1550
-        bool "Alchemy DB1550 board"
-        select ALCHEMY_GPIOINT_AU1000
        select HW_HAS_PCI
        select DMA_COHERENT
        select MIPS_DISABLE_OBSOLETE_IDE
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_HAS_EARLY_PRINTK
-config MIPS_PB1100
-        bool "Alchemy PB1100 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select SWAP_IO_SPACE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-config MIPS_PB1500
-        bool "Alchemy PB1500 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-config MIPS_PB1550
-        bool "Alchemy PB1550 board"
-        select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select MIPS_DISABLE_OBSOLETE_IDE
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
 config MIPS_XXS1500
        bool "MyCable XXS1500 board"
        select DMA_NONCOHERENT
diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform
index 7956274de15..942c5800a68 100644
--- a/arch/mips/alchemy/Platform
+++ b/arch/mips/alchemy/Platform
@@ -30,25 +30,11 @@ cflags-$(CONFIG_MIPS_DB1000)	+= -I$(srctree)/arch/mips/include/asm/mach-db1x00
 load-$(CONFIG_MIPS_DB1000)      += 0xffffffff80100000
 #
-# AMD Alchemy Db1550 eval board
+# AMD Alchemy Db1200/Pb1200/Db1550/Db1300 eval boards
 #
-platform-$(CONFIG_MIPS_DB1550)  += alchemy/devboards/
+platform-$(CONFIG_MIPS_DB1235)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1550)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
+cflags-$(CONFIG_MIPS_DB1235)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1550)      += 0xffffffff80100000
+load-$(CONFIG_MIPS_DB1235)      += 0xffffffff80100000
-#
-# AMD Alchemy Db1200/Pb1200 eval boards
-#
-platform-$(CONFIG_MIPS_DB1200)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1200)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1200)      += 0xffffffff80100000
-#
-# NetLogic DBAu1300 development platform
-#
-platform-$(CONFIG_MIPS_DB1300)  += alchemy/devboards/
-cflags-$(CONFIG_MIPS_DB1300)    += -I$(srctree)/arch/mips/include/asm/mach-db1x00
-load-$(CONFIG_MIPS_DB1300)      += 0xffffffff80100000
 #
 # 4G-Systems MTX-1 "MeshCube" wireless router
diff --git a/arch/mips/alchemy/devboards/Makefile b/arch/mips/alchemy/devboards/Makefile
index c9e747dd9fc..15bf7306648 100644
--- a/arch/mips/alchemy/devboards/Makefile
+++ b/arch/mips/alchemy/devboards/Makefile
@@ -4,10 +4,5 @@
 obj-y += bcsr.o platform.o
 obj-$(CONFIG_PM)                += pm.o
-obj-$(CONFIG_MIPS_PB1100)       += pb1100.o
-obj-$(CONFIG_MIPS_PB1500)       += pb1500.o
-obj-$(CONFIG_MIPS_PB1550)       += pb1550.o
 obj-$(CONFIG_MIPS_DB1000)       += db1000.o
-obj-$(CONFIG_MIPS_DB1200)       += db1200.o
+obj-$(CONFIG_MIPS_DB1235)       += db1235.o db1200.o db1300.o db1550.o
-obj-$(CONFIG_MIPS_DB1300)       += db1300.o
-obj-$(CONFIG_MIPS_DB1550)       += db1550.o
diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
index 1b81dbf6b80..8187845650f 100644
--- a/arch/mips/alchemy/devboards/db1000.c
+++ b/arch/mips/alchemy/devboards/db1000.c
@@ -1,5 +1,5 @@
 /*
- * DBAu1000/1500/1100 board support
+ * DBAu1000/1500/1100 PBAu1100/1500 board support
 *
 * Copyright 2000, 2008 MontaVista Software Inc.
 * Author: MontaVista Software, Inc. <source@mvista.com>
@@ -52,6 +52,11 @@ static const char *board_type_str(void)
                return "DB1500";
        case BCSR_WHOAMI_DB1100:
                return "DB1100";
+        case BCSR_WHOAMI_PB1500:
+        case BCSR_WHOAMI_PB1500R2:
+                return "PB1500";
+        case BCSR_WHOAMI_PB1100:
+                return "PB1100";
        default:
                return "(unknown)";
        }
@@ -111,7 +116,9 @@ static struct platform_device db1500_pci_host_dev = {
 static int __init db1500_pci_init(void)
 {
-        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1500)
+        int id = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
+        if ((id == BCSR_WHOAMI_DB1500) || (id == BCSR_WHOAMI_PB1500) ||
+            (id == BCSR_WHOAMI_PB1500R2))
                return platform_device_register(&db1500_pci_host_dev);
        return 0;
 }
@@ -199,27 +206,37 @@ static irqreturn_t db1100_mmc_cd(int irq, void *ptr)
 static int db1100_mmc_cd_setup(void *mmc_host, int en)
 {
-        int ret = 0;
+        int ret = 0, irq;
+        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)
+                irq = AU1100_GPIO19_INT;
+        else
+                irq = AU1100_GPIO14_INT;        /* PB1100 SD0 CD# */
        if (en) {
-                irq_set_irq_type(AU1100_GPIO19_INT, IRQ_TYPE_EDGE_BOTH);
+                irq_set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
-                ret = request_irq(AU1100_GPIO19_INT, db1100_mmc_cd, 0,
+                ret = request_irq(irq, db1100_mmc_cd, 0,
                                  "sd0_cd", mmc_host);
        } else
-                free_irq(AU1100_GPIO19_INT, mmc_host);
+                free_irq(irq, mmc_host);
        return ret;
 }
 static int db1100_mmc1_cd_setup(void *mmc_host, int en)
 {
-        int ret = 0;
+        int ret = 0, irq;
+        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)
+                irq = AU1100_GPIO20_INT;
+        else
+                irq = AU1100_GPIO15_INT;        /* PB1100 SD1 CD# */
        if (en) {
-                irq_set_irq_type(AU1100_GPIO20_INT, IRQ_TYPE_EDGE_BOTH);
+                irq_set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
-                ret = request_irq(AU1100_GPIO20_INT, db1100_mmc_cd, 0,
+                ret = request_irq(irq, db1100_mmc_cd, 0,
                                  "sd1_cd", mmc_host);
        } else
-                free_irq(AU1100_GPIO20_INT, mmc_host);
+                free_irq(irq, mmc_host);
        return ret;
 }
@@ -236,11 +253,18 @@ static int db1100_mmc_card_inserted(void *mmc_host)
 static void db1100_mmc_set_power(void *mmc_host, int state)
 {
+        int bit;
+        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)
+                bit = BCSR_BOARD_SD0PWR;
+        else
+                bit = BCSR_BOARD_PB1100_SD0PWR;
        if (state) {
-                bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD0PWR);
+                bcsr_mod(BCSR_BOARD, 0, bit);
                msleep(400);    /* stabilization time */
        } else
-                bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD0PWR, 0);
+                bcsr_mod(BCSR_BOARD, bit, 0);
 }
 static void db1100_mmcled_set(struct led_classdev *led, enum led_brightness b)
@@ -267,11 +291,18 @@ static int db1100_mmc1_card_inserted(void *mmc_host)
 static void db1100_mmc1_set_power(void *mmc_host, int state)
 {
+        int bit;
+        if (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) == BCSR_WHOAMI_DB1100)
+                bit = BCSR_BOARD_SD1PWR;
+        else
+                bit = BCSR_BOARD_PB1100_SD1PWR;
        if (state) {
-                bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_SD1PWR);
+                bcsr_mod(BCSR_BOARD, 0, bit);
                msleep(400);    /* stabilization time */
        } else
-                bcsr_mod(BCSR_BOARD, BCSR_BOARD_SD1PWR, 0);
+                bcsr_mod(BCSR_BOARD, bit, 0);
 }
 static void db1100_mmc1led_set(struct led_classdev *led, enum led_brightness b)
@@ -480,13 +511,12 @@ static struct platform_device *db1100_devs[] = {
        &db1100_mmc0_dev,
        &db1100_mmc1_dev,
        &db1000_irda_dev,
-        &db1100_spi_dev,
 };
 static int __init db1000_dev_init(void)
 {
        int board = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
-        int c0, c1, d0, d1, s0, s1;
+        int c0, c1, d0, d1, s0, s1, flashsize = 32,  twosocks = 1;
        unsigned long pfc;
        if (board == BCSR_WHOAMI_DB1500) {
@@ -522,6 +552,7 @@ static int __init db1000_dev_init(void)
                                        ARRAY_SIZE(db1100_spi_info));
                platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs));
+                platform_device_register(&db1100_spi_dev);
        } else if (board == BCSR_WHOAMI_DB1000) {
                c0 = AU1000_GPIO2_INT;
                c1 = AU1000_GPIO5_INT;
@@ -530,15 +561,42 @@ static int __init db1000_dev_init(void)
                s0 = AU1000_GPIO1_INT;
                s1 = AU1000_GPIO4_INT;
                platform_add_devices(db1000_devs, ARRAY_SIZE(db1000_devs));
+        } else if ((board == BCSR_WHOAMI_PB1500) ||
+                   (board == BCSR_WHOAMI_PB1500R2)) {
+                c0 = AU1500_GPIO203_INT;
+                d0 = AU1500_GPIO201_INT;
+                s0 = AU1500_GPIO202_INT;
+                twosocks = 0;
+                flashsize = 64;
+                /* RTC and daughtercard irqs */
+                irq_set_irq_type(AU1500_GPIO204_INT, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(AU1500_GPIO205_INT, IRQ_TYPE_LEVEL_LOW);
+                /* EPSON S1D13806 0x1b000000
+                 * SRAM 1MB/2MB   0x1a000000
+                 * DS1693 RTC     0x0c000000
+                 */
+        } else if (board == BCSR_WHOAMI_PB1100) {
+                c0 = AU1100_GPIO11_INT;
+                d0 = AU1100_GPIO9_INT;
+                s0 = AU1100_GPIO10_INT;
+                twosocks = 0;
+                flashsize = 64;
+                /* pendown, rtc, daughtercard irqs */
+                irq_set_irq_type(AU1100_GPIO8_INT, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(AU1100_GPIO12_INT, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(AU1100_GPIO13_INT, IRQ_TYPE_LEVEL_LOW);
+                /* EPSON S1D13806 0x1b000000
+                 * SRAM 1MB/2MB   0x1a000000
+                 * DiskOnChip     0x0d000000
+                 * DS1693 RTC     0x0c000000
+                 */
+                platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs));
        } else
                return 0; /* unknown board, no further dev setup to do */
        irq_set_irq_type(d0, IRQ_TYPE_EDGE_BOTH);
-        irq_set_irq_type(d1, IRQ_TYPE_EDGE_BOTH);
        irq_set_irq_type(c0, IRQ_TYPE_LEVEL_LOW);
-        irq_set_irq_type(c1, IRQ_TYPE_LEVEL_LOW);
        irq_set_irq_type(s0, IRQ_TYPE_LEVEL_LOW);
-        irq_set_irq_type(s1, IRQ_TYPE_LEVEL_LOW);
        db1x_register_pcmcia_socket(
                AU1000_PCMCIA_ATTR_PHYS_ADDR,
@@ -549,17 +607,23 @@ static int __init db1000_dev_init(void)
                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
                c0, d0, /*s0*/0, 0, 0);
-        db1x_register_pcmcia_socket(
+        if (twosocks) {
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
+                irq_set_irq_type(d1, IRQ_TYPE_EDGE_BOTH);
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
+                irq_set_irq_type(c1, IRQ_TYPE_LEVEL_LOW);
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,
+                irq_set_irq_type(s1, IRQ_TYPE_LEVEL_LOW);
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
+                db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
+                        AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
-                c1, d1, /*s1*/0, 0, 1);
+                        AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
+                        AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,
+                        AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
+                        AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
+                        AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
+                        c1, d1, /*s1*/0, 0, 1);
+        }
        platform_add_devices(db1x00_devs, ARRAY_SIZE(db1x00_devs));
-        db1x_register_norflash(32 << 20, 4 /* 32bit */, F_SWAPPED);
+        db1x_register_norflash(flashsize << 20, 4 /* 32bit */, F_SWAPPED);
        return 0;
 }
 device_initcall(db1000_dev_init);
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index bf2248474fa..299b7d202be 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -45,25 +45,9 @@
 #include "platform.h"
-static const char *board_type_str(void)
+const char *get_system_type(void);
-{
-        switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
-        case BCSR_WHOAMI_PB1200_DDR1:
-        case BCSR_WHOAMI_PB1200_DDR2:
-                return "PB1200";
-        case BCSR_WHOAMI_DB1200:
-                return "DB1200";
-        default:
-                return "(unknown)";
-        }
-}
-const char *get_system_type(void)
+static int __init db1200_detect_board(void)
-{
-        return board_type_str();
-}
-static int __init detect_board(void)
 {
        int bid;
@@ -96,19 +80,17 @@ static int __init detect_board(void)
        return 1;       /* it's neither */
 }
-void __init board_setup(void)
+int __init db1200_board_setup(void)
 {
        unsigned long freq0, clksrc, div, pfc;
        unsigned short whoami;
-        if (detect_board()) {
+        if (db1200_detect_board())
-                printk(KERN_ERR "NOT running on a DB1200/PB1200 board!\n");
+                return -ENODEV;
-                return;
-        }
        whoami = bcsr_read(BCSR_WHOAMI);
        printk(KERN_INFO "Alchemy/AMD/RMI %s Board, CPLD Rev %d"
-                "  Board-ID %d  Daughtercard ID %d\n", board_type_str(),
+                "  Board-ID %d  Daughtercard ID %d\n", get_system_type(),
                (whoami >> 4) & 0xf, (whoami >> 8) & 0xf, whoami & 0xf);
        /* SMBus/SPI on PSC0, Audio on PSC1 */
@@ -138,6 +120,8 @@ void __init board_setup(void)
        clksrc = SYS_CS_MUX_FQ0 << SYS_CS_ME0_BIT;
        __raw_writel(clksrc, (void __iomem *)SYS_CLKSRC);
        wmb();
+        return 0;
 }
 /******************************************************************************/
@@ -796,7 +780,7 @@ static int __init pb1200_res_fixup(void)
        return 0;
 }
-static int __init db1200_dev_init(void)
+int __init db1200_dev_setup(void)
 {
        unsigned long pfc;
        unsigned short sw;
@@ -846,7 +830,7 @@ static int __init db1200_dev_init(void)
        gpio_request(215, "otg-vbus");
        gpio_direction_output(215, 1);
-        printk(KERN_INFO "%s device configuration:\n", board_type_str());
+        printk(KERN_INFO "%s device configuration:\n", get_system_type());
        sw = bcsr_read(BCSR_SWITCHES);
        if (sw & BCSR_SWITCHES_DIP_8) {
@@ -922,4 +906,3 @@ static int __init db1200_dev_init(void)
        return 0;
 }
-device_initcall(db1200_dev_init);
diff --git a/arch/mips/alchemy/devboards/db1235.c b/arch/mips/alchemy/devboards/db1235.c
new file mode 100644
index 00000000000..c76a90f7866
--- /dev/null
+++ b/arch/mips/alchemy/devboards/db1235.c
@@ -0,0 +1,94 @@
+/*
+ * DB1200/PB1200 / DB1550 / DB1300 board support.
+ *
+ * These 4 boards can reliably be supported in a single kernel image.
+ */
+#include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-db1x00/bcsr.h>
+int __init db1200_board_setup(void);
+int __init db1200_dev_setup(void);
+int __init db1300_board_setup(void);
+int __init db1300_dev_setup(void);
+int __init db1550_board_setup(void);
+int __init db1550_dev_setup(void);
+int __init db1550_pci_setup(int);
+static const char *board_type_str(void)
+{
+        switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
+        case BCSR_WHOAMI_PB1200_DDR1:
+        case BCSR_WHOAMI_PB1200_DDR2:
+                return "PB1200";
+        case BCSR_WHOAMI_DB1200:
+                return "DB1200";
+        case BCSR_WHOAMI_DB1300:
+                return "DB1300";
+        case BCSR_WHOAMI_DB1550:
+                return "DB1550";
+        case BCSR_WHOAMI_PB1550_SDR:
+        case BCSR_WHOAMI_PB1550_DDR:
+                return "PB1550";
+        default:
+                return "(unknown)";
+        }
+}
+const char *get_system_type(void)
+{
+        return board_type_str();
+}
+void __init board_setup(void)
+{
+        int ret;
+        switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1550:
+                ret = db1550_board_setup();
+                break;
+        case ALCHEMY_CPU_AU1200:
+                ret = db1200_board_setup();
+                break;
+        case ALCHEMY_CPU_AU1300:
+                ret = db1300_board_setup();
+                break;
+        default:
+                pr_err("unsupported CPU on board\n");
+                ret = -ENODEV;
+        }
+        if (ret)
+                panic("cannot initialize board support\n");
+}
+int __init db1235_arch_init(void)
+{
+        int id = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
+        if (id == BCSR_WHOAMI_DB1550)
+                return db1550_pci_setup(0);
+        else if ((id == BCSR_WHOAMI_PB1550_SDR) ||
+                 (id == BCSR_WHOAMI_PB1550_DDR))
+                return db1550_pci_setup(1);
+        return 0;
+}
+arch_initcall(db1235_arch_init);
+int __init db1235_dev_init(void)
+{
+        switch (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI))) {
+        case BCSR_WHOAMI_PB1200_DDR1:
+        case BCSR_WHOAMI_PB1200_DDR2:
+        case BCSR_WHOAMI_DB1200:
+                return db1200_dev_setup();
+        case BCSR_WHOAMI_DB1300:
+                return db1300_dev_setup();
+        case BCSR_WHOAMI_DB1550:
+        case BCSR_WHOAMI_PB1550_SDR:
+        case BCSR_WHOAMI_PB1550_DDR:
+                return db1550_dev_setup();
+        }
+        return 0;
+}
+device_initcall(db1235_dev_init);
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index c56e0246694..cdf37cbd3d1 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -110,11 +110,6 @@ static void __init db1300_gpio_config(void)
        au1300_set_dbdma_gpio(1, AU1300_PIN_FG3AUX);
 }
-char *get_system_type(void)
-{
-        return "DB1300";
-}
 /**********************************************************************/
 static void au1300_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
@@ -701,7 +696,7 @@ static struct platform_device *db1300_dev[] __initdata = {
        &db1300_sndi2s_dev,
 };
-static int __init db1300_device_init(void)
+int __init db1300_dev_setup(void)
 {
        int swapped, cpldirq;
@@ -758,10 +753,9 @@ static int __init db1300_device_init(void)
        return platform_add_devices(db1300_dev, ARRAY_SIZE(db1300_dev));
 }
-device_initcall(db1300_device_init);
-void __init board_setup(void)
+int __init db1300_board_setup(void)
 {
        unsigned short whoami;
@@ -779,4 +773,6 @@ void __init board_setup(void)
        alchemy_uart_enable(AU1300_UART0_PHYS_ADDR);
        alchemy_uart_enable(AU1300_UART1_PHYS_ADDR);
        alchemy_uart_enable(AU1300_UART3_PHYS_ADDR);
+        return 0;
 }
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 9eb79062f46..5a9ae609542 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -1,5 +1,5 @@
 /*
- * Alchemy Db1550 board support
+ * Alchemy Db1550/Pb1550 board support
 *
 * (c) 2011 Manuel Lauss <manuel.lauss@googlemail.com>
 */
@@ -17,34 +17,29 @@
 #include <linux/pm.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
+#include <asm/bootinfo.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_eth.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 #include <asm/mach-au1x00/au1xxx_psc.h>
 #include <asm/mach-au1x00/au1550_spi.h>
+#include <asm/mach-au1x00/au1550nd.h>
 #include <asm/mach-db1x00/bcsr.h>
 #include <prom.h>
 #include "platform.h"
-const char *get_system_type(void)
-{
-        return "DB1550";
-}
 static void __init db1550_hw_setup(void)
 {
        void __iomem *base;
-        alchemy_gpio_direction_output(203, 0);  /* red led on */
        /* complete SPI setup: link psc0_intclk to a 48MHz source,
-         * and assign GPIO16 to PSC0_SYNC1 (SPI cs# line)
+         * and assign GPIO16 to PSC0_SYNC1 (SPI cs# line) as well as PSC1_SYNC
+         * for AC97 on PB1550.
         */
        base = (void __iomem *)SYS_CLKSRC;
        __raw_writel(__raw_readl(base) | 0x000001e0, base);
        base = (void __iomem *)SYS_PINFUNC;
-        __raw_writel(__raw_readl(base) | 1, base);
+        __raw_writel(__raw_readl(base) | 1 | SYS_PF_PSC1_S1, base);
        wmb();
        /* reset the AC97 codec now, the reset time in the psc-ac97 driver
@@ -57,23 +52,27 @@ static void __init db1550_hw_setup(void)
        wmb();
        __raw_writel(PSC_AC97RST_RST, base + PSC_AC97RST_OFFSET);
        wmb();
-        alchemy_gpio_direction_output(202, 0);  /* green led on */
 }
-void __init board_setup(void)
+int __init db1550_board_setup(void)
 {
        unsigned short whoami;
        bcsr_init(DB1550_BCSR_PHYS_ADDR,
                  DB1550_BCSR_PHYS_ADDR + DB1550_BCSR_HEXLED_OFS);
-        whoami = bcsr_read(BCSR_WHOAMI);
+        whoami = bcsr_read(BCSR_WHOAMI); /* PB1550 hexled offset differs */
-        printk(KERN_INFO "Alchemy/AMD DB1550 Board, CPLD Rev %d"
+        if ((BCSR_WHOAMI_BOARD(whoami) == BCSR_WHOAMI_PB1550_SDR) ||
-                "  Board-ID %d  Daughtercard ID %d\n",
+            (BCSR_WHOAMI_BOARD(whoami) == BCSR_WHOAMI_PB1550_DDR))
+                bcsr_init(PB1550_BCSR_PHYS_ADDR,
+                          PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
+        pr_info("Alchemy/AMD %s Board, CPLD Rev %d Board-ID %d  "       \
+                "Daughtercard ID %d\n", get_system_type(),
                (whoami >> 4) & 0xf, (whoami >> 8) & 0xf, whoami & 0xf);
        db1550_hw_setup();
+        return 0;
 }
 /*****************************************************************************/
@@ -194,6 +193,39 @@ static struct platform_device db1550_nand_dev = {
        }
 };
+static struct au1550nd_platdata pb1550_nand_pd = {
+        .parts          = db1550_nand_parts,
+        .num_parts      = ARRAY_SIZE(db1550_nand_parts),
+        .devwidth       = 0,    /* x8 NAND default, needs fixing up */
+};
+static struct platform_device pb1550_nand_dev = {
+        .name           = "au1550-nand",
+        .id             = -1,
+        .resource       = db1550_nand_res,
+        .num_resources  = ARRAY_SIZE(db1550_nand_res),
+        .dev            = {
+                .platform_data  = &pb1550_nand_pd,
+        },
+};
+static void __init pb1550_nand_setup(void)
+{
+        int boot_swapboot = (au_readl(MEM_STSTAT) & (0x7 << 1)) |
+                            ((bcsr_read(BCSR_STATUS) >> 6) & 0x1);
+        gpio_direction_input(206);      /* de-assert NAND CS# */
+        switch (boot_swapboot) {
+        case 0: case 2: case 8: case 0xC: case 0xD:
+                /* x16 NAND Flash */
+                pb1550_nand_pd.devwidth = 1;
+                /* fallthrough */
+        case 1: case 3: case 9: case 0xE: case 0xF:
+                /* x8 NAND, already set up */
+                platform_device_register(&pb1550_nand_dev);
+        }
+}
 /**********************************************************************/
 static struct resource au1550_psc0_res[] = {
@@ -394,6 +426,29 @@ static int db1550_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
        return -1;
 }
+static int pb1550_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
+{
+        if ((slot < 12) || (slot > 13) || pin == 0)
+                return -1;
+        if (slot == 12) {
+                switch (pin) {
+                case 1: return AU1500_PCI_INTB;
+                case 2: return AU1500_PCI_INTC;
+                case 3: return AU1500_PCI_INTD;
+                case 4: return AU1500_PCI_INTA;
+                }
+        }
+        if (slot == 13) {
+                switch (pin) {
+                case 1: return AU1500_PCI_INTA;
+                case 2: return AU1500_PCI_INTB;
+                case 3: return AU1500_PCI_INTC;
+                case 4: return AU1500_PCI_INTD;
+                }
+        }
+        return -1;
+}
 static struct resource alchemy_pci_host_res[] = {
        [0] = {
                .start  = AU1500_PCI_PHYS_ADDR,
@@ -417,7 +472,6 @@ static struct platform_device db1550_pci_host_dev = {
 /**********************************************************************/
 static struct platform_device *db1550_devs[] __initdata = {
-        &db1550_nand_dev,
        &db1550_i2c_dev,
        &db1550_ac97_dev,
        &db1550_spi_dev,
@@ -430,15 +484,16 @@ static struct platform_device *db1550_devs[] __initdata = {
 };
 /* must be arch_initcall; MIPS PCI scans busses in a subsys_initcall */
-static int __init db1550_pci_init(void)
+int __init db1550_pci_setup(int id)
 {
+        if (id)
+                db1550_pci_pd.board_map_irq = pb1550_map_pci_irq;
        return platform_device_register(&db1550_pci_host_dev);
 }
-arch_initcall(db1550_pci_init);
-static int __init db1550_dev_init(void)
+static void __init db1550_devices(void)
 {
-        int swapped;
+        alchemy_gpio_direction_output(203, 0);  /* red led on */
        irq_set_irq_type(AU1550_GPIO0_INT, IRQ_TYPE_EDGE_BOTH);  /* CD0# */
        irq_set_irq_type(AU1550_GPIO1_INT, IRQ_TYPE_EDGE_BOTH);  /* CD1# */
@@ -447,6 +502,75 @@ static int __init db1550_dev_init(void)
        irq_set_irq_type(AU1550_GPIO21_INT, IRQ_TYPE_LEVEL_LOW); /* STSCHG0# */
        irq_set_irq_type(AU1550_GPIO22_INT, IRQ_TYPE_LEVEL_LOW); /* STSCHG1# */
+        db1x_register_pcmcia_socket(
+                AU1000_PCMCIA_ATTR_PHYS_ADDR,
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
+                AU1000_PCMCIA_MEM_PHYS_ADDR,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
+                AU1000_PCMCIA_IO_PHYS_ADDR,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
+                AU1550_GPIO3_INT, AU1550_GPIO0_INT,
+                /*AU1550_GPIO21_INT*/0, 0, 0);
+        db1x_register_pcmcia_socket(
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
+                AU1550_GPIO5_INT, AU1550_GPIO1_INT,
+                /*AU1550_GPIO22_INT*/0, 0, 1);
+        platform_device_register(&db1550_nand_dev);
+        alchemy_gpio_direction_output(202, 0);  /* green led on */
+}
+static void __init pb1550_devices(void)
+{
+        irq_set_irq_type(AU1550_GPIO0_INT, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(AU1550_GPIO1_INT, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(AU1550_GPIO201_205_INT, IRQ_TYPE_LEVEL_HIGH);
+        /* enable both PCMCIA card irqs in the shared line */
+        alchemy_gpio2_enable_int(201);  /* socket 0 card irq */
+        alchemy_gpio2_enable_int(202);  /* socket 1 card irq */
+        /* Pb1550, like all others, also has statuschange irqs; however they're
+        * wired up on one of the Au1550's shared GPIO201_205 line, which also
+        * services the PCMCIA card interrupts.  So we ignore statuschange and
+        * use the GPIO201_205 exclusively for card interrupts, since a) pcmcia
+        * drivers are used to shared irqs and b) statuschange isn't really use-
+        * ful anyway.
+        */
+        db1x_register_pcmcia_socket(
+                AU1000_PCMCIA_ATTR_PHYS_ADDR,
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
+                AU1000_PCMCIA_MEM_PHYS_ADDR,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
+                AU1000_PCMCIA_IO_PHYS_ADDR,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
+                AU1550_GPIO201_205_INT, AU1550_GPIO0_INT, 0, 0, 0);
+        db1x_register_pcmcia_socket(
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008000000,
+                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008000000,
+                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008400000 - 1,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008000000,
+                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008010000 - 1,
+                AU1550_GPIO201_205_INT, AU1550_GPIO1_INT, 0, 0, 1);
+        pb1550_nand_setup();
+}
+int __init db1550_dev_setup(void)
+{
+        int swapped, id;
+        id = (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) != BCSR_WHOAMI_DB1550);
        i2c_register_board_info(0, db1550_i2c_devs,
                                ARRAY_SIZE(db1550_i2c_devs));
        spi_register_board_info(db1550_spi_devs,
@@ -467,29 +591,11 @@ static int __init db1550_dev_init(void)
            (void __iomem *)KSEG1ADDR(AU1550_PSC2_PHYS_ADDR) + PSC_SEL_OFFSET);
        wmb();
-        db1x_register_pcmcia_socket(
+        id ? pb1550_devices() : db1550_devices();
-                AU1000_PCMCIA_ATTR_PHYS_ADDR,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1550_GPIO3_INT, AU1550_GPIO0_INT,
-                /*AU1550_GPIO21_INT*/0, 0, 0);
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004000000,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x004400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004000000,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x004010000 - 1,
-                AU1550_GPIO5_INT, AU1550_GPIO1_INT,
-                /*AU1550_GPIO22_INT*/0, 0, 1);
-        swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT;
+        swapped = bcsr_read(BCSR_STATUS) &
+               (id ? BCSR_STATUS_PB1550_SWAPBOOT : BCSR_STATUS_DB1000_SWAPBOOT);
        db1x_register_norflash(128 << 20, 4, swapped);
        return platform_add_devices(db1550_devs, ARRAY_SIZE(db1550_devs));
 }
-device_initcall(db1550_dev_init);
diff --git a/arch/mips/alchemy/devboards/pb1100.c b/arch/mips/alchemy/devboards/pb1100.c
deleted file mode 100644
index 78c77a44a31..00000000000
--- a/arch/mips/alchemy/devboards/pb1100.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Pb1100 board platform device registration
- *
- * Copyright (C) 2009 Manuel Lauss
- *
- * 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 program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-db1x00/bcsr.h>
-#include <prom.h>
-#include "platform.h"
-const char *get_system_type(void)
-{
-        return "PB1100";
-}
-void __init board_setup(void)
-{
-        volatile void __iomem *base = (volatile void __iomem *)0xac000000UL;
-        bcsr_init(DB1000_BCSR_PHYS_ADDR,
-                  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);
-        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
-        au_writel(8, SYS_AUXPLL);
-        alchemy_gpio1_input_enable();
-        udelay(100);
-#if IS_ENABLED(CONFIG_USB_OHCI_HCD)
-        {
-                u32 pin_func, sys_freqctrl, sys_clksrc;
-                /* Configure pins GPIO[14:9] as GPIO */
-                pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
-                /* Zero and disable FREQ2 */
-                sys_freqctrl = au_readl(SYS_FREQCTRL0);
-                sys_freqctrl &= ~0xFFF00000;
-                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-                /* Zero and disable USBH/USBD/IrDA clock */
-                sys_clksrc = au_readl(SYS_CLKSRC);
-                sys_clksrc &= ~(SYS_CS_CIR | SYS_CS_DIR | SYS_CS_MIR_MASK);
-                au_writel(sys_clksrc, SYS_CLKSRC);
-                sys_freqctrl = au_readl(SYS_FREQCTRL0);
-                sys_freqctrl &= ~0xFFF00000;
-                sys_clksrc = au_readl(SYS_CLKSRC);
-                sys_clksrc &= ~(SYS_CS_CIR | SYS_CS_DIR | SYS_CS_MIR_MASK);
-                /* FREQ2 = aux / 2 = 48 MHz */
-                sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) |
-                                SYS_FC_FE2 | SYS_FC_FS2;
-                au_writel(sys_freqctrl, SYS_FREQCTRL0);
-                /*
-                 * Route 48 MHz FREQ2 into USBH/USBD/IrDA
-                 */
-                sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MIR_BIT;
-                au_writel(sys_clksrc, SYS_CLKSRC);
-                /* Setup the static bus controller */
-                au_writel(0x00000002, MEM_STCFG3);  /* type = PCMCIA */
-                au_writel(0x280E3D07, MEM_STTIME3); /* 250ns cycle time */
-                au_writel(0x10000000, MEM_STADDR3); /* any PCMCIA select */
-                /*
-                 * Get USB Functionality pin state (device vs host drive pins).
-                 */
-                pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_USB;
-                /* 2nd USB port is USB host. */
-                pin_func |= SYS_PF_USB;
-                au_writel(pin_func, SYS_PINFUNC);
-        }
-#endif /* IS_ENABLED(CONFIG_USB_OHCI_HCD) */
-        /* Enable sys bus clock divider when IDLE state or no bus activity. */
-        au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
-        /* Enable the RTC if not already enabled. */
-        if (!(readb(base + 0x28) & 0x20)) {
-                writeb(readb(base + 0x28) | 0x20, base + 0x28);
-                au_sync();
-        }
-        /* Put the clock in BCD mode. */
-        if (readb(base + 0x2C) & 0x4) { /* reg B */
-                writeb(readb(base + 0x2c) & ~0x4, base + 0x2c);
-                au_sync();
-        }
-}
-/******************************************************************************/
-static struct resource au1100_lcd_resources[] = {
-        [0] = {
-                .start  = AU1100_LCD_PHYS_ADDR,
-                .end    = AU1100_LCD_PHYS_ADDR + 0x800 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AU1100_LCD_INT,
-                .end    = AU1100_LCD_INT,
-                .flags  = IORESOURCE_IRQ,
-        }
-};
-static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);
-static struct platform_device au1100_lcd_device = {
-        .name           = "au1100-lcd",
-        .id             = 0,
-        .dev = {
-                .dma_mask               = &au1100_lcd_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .num_resources  = ARRAY_SIZE(au1100_lcd_resources),
-        .resource       = au1100_lcd_resources,
-};
-static int __init pb1100_dev_init(void)
-{
-        int swapped;
-        irq_set_irq_type(AU1100_GPIO9_INT, IRQF_TRIGGER_LOW); /* PCCD# */
-        irq_set_irq_type(AU1100_GPIO10_INT, IRQF_TRIGGER_LOW); /* PCSTSCHG# */
-        irq_set_irq_type(AU1100_GPIO11_INT, IRQF_TRIGGER_LOW); /* PCCard# */
-        irq_set_irq_type(AU1100_GPIO13_INT, IRQF_TRIGGER_LOW); /* DC_IRQ# */
-        /* PCMCIA. single socket, identical to Pb1500 */
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1100_GPIO11_INT, AU1100_GPIO9_INT,     /* card / insert */
-                /*AU1100_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */
-        swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1000_SWAPBOOT;
-        db1x_register_norflash(64 * 1024 * 1024, 4, swapped);
-        platform_device_register(&au1100_lcd_device);
-        return 0;
-}
-device_initcall(pb1100_dev_init);
diff --git a/arch/mips/alchemy/devboards/pb1500.c b/arch/mips/alchemy/devboards/pb1500.c
deleted file mode 100644
index 232fee94200..00000000000
--- a/arch/mips/alchemy/devboards/pb1500.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Pb1500 board support.
- *
- * Copyright (C) 2009 Manuel Lauss
- *
- * 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 program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/delay.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-db1x00/bcsr.h>
-#include <prom.h>
-#include "platform.h"
-const char *get_system_type(void)
-{
-        return "PB1500";
-}
-void __init board_setup(void)
-{
-        u32 pin_func;
-        u32 sys_freqctrl, sys_clksrc;
-        bcsr_init(DB1000_BCSR_PHYS_ADDR,
-                  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);
-        sys_clksrc = sys_freqctrl = pin_func = 0;
-        /* Set AUX clock to 12 MHz * 8 = 96 MHz */
-        au_writel(8, SYS_AUXPLL);
-        alchemy_gpio1_input_enable();
-        udelay(100);
-        /* GPIO201 is input for PCMCIA card detect */
-        /* GPIO203 is input for PCMCIA interrupt request */
-        alchemy_gpio_direction_input(201);
-        alchemy_gpio_direction_input(203);
-#if IS_ENABLED(CONFIG_USB_OHCI_HCD)
-        /* Zero and disable FREQ2 */
-        sys_freqctrl = au_readl(SYS_FREQCTRL0);
-        sys_freqctrl &= ~0xFFF00000;
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
-        /* zero and disable USBH/USBD clocks */
-        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
-                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-        au_writel(sys_clksrc, SYS_CLKSRC);
-        sys_freqctrl = au_readl(SYS_FREQCTRL0);
-        sys_freqctrl &= ~0xFFF00000;
-        sys_clksrc = au_readl(SYS_CLKSRC);
-        sys_clksrc &= ~(SYS_CS_CUD | SYS_CS_DUD | SYS_CS_MUD_MASK |
-                        SYS_CS_CUH | SYS_CS_DUH | SYS_CS_MUH_MASK);
-        /* FREQ2 = aux/2 = 48 MHz */
-        sys_freqctrl |= (0 << SYS_FC_FRDIV2_BIT) | SYS_FC_FE2 | SYS_FC_FS2;
-        au_writel(sys_freqctrl, SYS_FREQCTRL0);
-        /*
-         * Route 48MHz FREQ2 into USB Host and/or Device
-         */
-        sys_clksrc |= SYS_CS_MUX_FQ2 << SYS_CS_MUH_BIT;
-        au_writel(sys_clksrc, SYS_CLKSRC);
-        pin_func = au_readl(SYS_PINFUNC) & ~SYS_PF_USB;
-        /* 2nd USB port is USB host */
-        pin_func |= SYS_PF_USB;
-        au_writel(pin_func, SYS_PINFUNC);
-#endif /* IS_ENABLED(CONFIG_USB_OHCI_HCD) */
-#ifdef CONFIG_PCI
-        {
-                void __iomem *base =
-                                (void __iomem *)KSEG1ADDR(AU1500_PCI_PHYS_ADDR);
-                /* Setup PCI bus controller */
-                __raw_writel(0x00003fff, base + PCI_REG_CMEM);
-                __raw_writel(0xf0000000, base + PCI_REG_MWMASK_DEV);
-                __raw_writel(0, base + PCI_REG_MWBASE_REV_CCL);
-                __raw_writel(0x02a00356, base + PCI_REG_STATCMD);
-                __raw_writel(0x00003c04, base + PCI_REG_PARAM);
-                __raw_writel(0x00000008, base + PCI_REG_MBAR);
-                wmb();
-        }
-#endif
-        /* Enable sys bus clock divider when IDLE state or no bus activity. */
-        au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
-        /* Enable the RTC if not already enabled */
-        if (!(au_readl(0xac000028) & 0x20)) {
-                printk(KERN_INFO "enabling clock ...\n");
-                au_writel((au_readl(0xac000028) | 0x20), 0xac000028);
-        }
-        /* Put the clock in BCD mode */
-        if (au_readl(0xac00002c) & 0x4) { /* reg B */
-                au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c);
-                au_sync();
-        }
-}
-/******************************************************************************/
-static int pb1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
-{
-        if ((slot < 12) || (slot > 13) || pin == 0)
-                return -1;
-        if (slot == 12)
-                return (pin == 1) ? AU1500_PCI_INTA : 0xff;
-        if (slot == 13) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTA;
-                case 2: return AU1500_PCI_INTB;
-                case 3: return AU1500_PCI_INTC;
-                case 4: return AU1500_PCI_INTD;
-                }
-        }
-        return -1;
-}
-static struct resource alchemy_pci_host_res[] = {
-        [0] = {
-                .start  = AU1500_PCI_PHYS_ADDR,
-                .end    = AU1500_PCI_PHYS_ADDR + 0xfff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-static struct alchemy_pci_platdata pb1500_pci_pd = {
-        .board_map_irq  = pb1500_map_pci_irq,
-        .pci_cfg_set    = PCI_CONFIG_AEN | PCI_CONFIG_R2H | PCI_CONFIG_R1H |
-                          PCI_CONFIG_CH |
-#if defined(__MIPSEB__)
-                          PCI_CONFIG_SIC_HWA_DAT | PCI_CONFIG_SM,
-#else
-                          0,
-#endif
-};
-static struct platform_device pb1500_pci_host = {
-        .dev.platform_data = &pb1500_pci_pd,
-        .name           = "alchemy-pci",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(alchemy_pci_host_res),
-        .resource       = alchemy_pci_host_res,
-};
-static int __init pb1500_dev_init(void)
-{
-        int swapped;
-        irq_set_irq_type(AU1500_GPIO9_INT,   IRQF_TRIGGER_LOW);   /* CD0# */
-        irq_set_irq_type(AU1500_GPIO10_INT,  IRQF_TRIGGER_LOW);  /* CARD0 */
-        irq_set_irq_type(AU1500_GPIO11_INT,  IRQF_TRIGGER_LOW);  /* STSCHG0# */
-        irq_set_irq_type(AU1500_GPIO204_INT, IRQF_TRIGGER_HIGH);
-        irq_set_irq_type(AU1500_GPIO201_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1500_GPIO202_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1500_GPIO203_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1500_GPIO205_INT, IRQF_TRIGGER_LOW);
-        /* PCMCIA. single socket, identical to Pb1100 */
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1500_GPIO11_INT, AU1500_GPIO9_INT,     /* card / insert */
-                /*AU1500_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */
-        swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1000_SWAPBOOT;
-        db1x_register_norflash(64 * 1024 * 1024, 4, swapped);
-        platform_device_register(&pb1500_pci_host);
-        return 0;
-}
-arch_initcall(pb1500_dev_init);
diff --git a/arch/mips/alchemy/devboards/pb1550.c b/arch/mips/alchemy/devboards/pb1550.c
deleted file mode 100644
index b37e7de8d92..00000000000
--- a/arch/mips/alchemy/devboards/pb1550.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Pb1550 board support.
- *
- * Copyright (C) 2009-2011 Manuel Lauss
- *
- * 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 program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/dma-mapping.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-au1x00/au1xxx_dbdma.h>
-#include <asm/mach-au1x00/au1550nd.h>
-#include <asm/mach-au1x00/gpio.h>
-#include <asm/mach-db1x00/bcsr.h>
-#include "platform.h"
-const char *get_system_type(void)
-{
-        return "PB1550";
-}
-void __init board_setup(void)
-{
-        u32 pin_func;
-        bcsr_init(PB1550_BCSR_PHYS_ADDR,
-                  PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
-        alchemy_gpio2_enable();
-        /*
-         * Enable PSC1 SYNC for AC'97.  Normaly done in audio driver,
-         * but it is board specific code, so put it here.
-         */
-        pin_func = au_readl(SYS_PINFUNC);
-        au_sync();
-        pin_func |= SYS_PF_MUST_BE_SET | SYS_PF_PSC1_S1;
-        au_writel(pin_func, SYS_PINFUNC);
-        bcsr_write(BCSR_PCMCIA, 0);     /* turn off PCMCIA power */
-        printk(KERN_INFO "AMD Alchemy Pb1550 Board\n");
-}
-/******************************************************************************/
-static int pb1550_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin)
-{
-        if ((slot < 12) || (slot > 13) || pin == 0)
-                return -1;
-        if (slot == 12) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTB;
-                case 2: return AU1500_PCI_INTC;
-                case 3: return AU1500_PCI_INTD;
-                case 4: return AU1500_PCI_INTA;
-                }
-        }
-        if (slot == 13) {
-                switch (pin) {
-                case 1: return AU1500_PCI_INTA;
-                case 2: return AU1500_PCI_INTB;
-                case 3: return AU1500_PCI_INTC;
-                case 4: return AU1500_PCI_INTD;
-                }
-        }
-        return -1;
-}
-static struct resource alchemy_pci_host_res[] = {
-        [0] = {
-                .start  = AU1500_PCI_PHYS_ADDR,
-                .end    = AU1500_PCI_PHYS_ADDR + 0xfff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-static struct alchemy_pci_platdata pb1550_pci_pd = {
-        .board_map_irq  = pb1550_map_pci_irq,
-};
-static struct platform_device pb1550_pci_host = {
-        .dev.platform_data = &pb1550_pci_pd,
-        .name           = "alchemy-pci",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(alchemy_pci_host_res),
-        .resource       = alchemy_pci_host_res,
-};
-static struct resource au1550_psc2_res[] = {
-        [0] = {
-                .start  = AU1550_PSC2_PHYS_ADDR,
-                .end    = AU1550_PSC2_PHYS_ADDR + 0xfff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = AU1550_PSC2_INT,
-                .end    = AU1550_PSC2_INT,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = AU1550_DSCR_CMD0_PSC2_TX,
-                .end    = AU1550_DSCR_CMD0_PSC2_TX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start  = AU1550_DSCR_CMD0_PSC2_RX,
-                .end    = AU1550_DSCR_CMD0_PSC2_RX,
-                .flags  = IORESOURCE_DMA,
-        },
-};
-static struct platform_device pb1550_i2c_dev = {
-        .name           = "au1xpsc_smbus",
-        .id             = 0,    /* bus number */
-        .num_resources  = ARRAY_SIZE(au1550_psc2_res),
-        .resource       = au1550_psc2_res,
-};
-static struct mtd_partition pb1550_nand_parts[] = {
-        [0] = {
-                .name   = "NAND FS 0",
-                .offset = 0,
-                .size   = 8 * 1024 * 1024,
-        },
-        [1] = {
-                .name   = "NAND FS 1",
-                .offset = MTDPART_OFS_APPEND,
-                .size   = MTDPART_SIZ_FULL,
-        },
-};
-static struct au1550nd_platdata pb1550_nand_pd = {
-        .parts          = pb1550_nand_parts,
-        .num_parts      = ARRAY_SIZE(pb1550_nand_parts),
-        .devwidth       = 0,    /* x8 NAND default, needs fixing up */
-};
-static struct resource pb1550_nand_res[] = {
-        [0] = {
-                .start  = 0x20000000,
-                .end    = 0x20000fff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-static struct platform_device pb1550_nand_dev = {
-        .name           = "au1550-nand",
-        .id             = -1,
-        .resource       = pb1550_nand_res,
-        .num_resources  = ARRAY_SIZE(pb1550_nand_res),
-        .dev            = {
-                .platform_data  = &pb1550_nand_pd,
-        },
-};
-static void __init pb1550_nand_setup(void)
-{
-        int boot_swapboot = (au_readl(MEM_STSTAT) & (0x7 << 1)) |
-                            ((bcsr_read(BCSR_STATUS) >> 6) & 0x1);
-        switch (boot_swapboot) {
-        case 0:
-        case 2:
-        case 8:
-        case 0xC:
-        case 0xD:
-                /* x16 NAND Flash */
-                pb1550_nand_pd.devwidth = 1;
-                /* fallthrough */
-        case 1:
-        case 9:
-        case 3:
-        case 0xE:
-        case 0xF:
-                /* x8 NAND, already set up */
-                platform_device_register(&pb1550_nand_dev);
-        }
-}
-static int __init pb1550_dev_init(void)
-{
-        int swapped;
-        irq_set_irq_type(AU1550_GPIO0_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1550_GPIO1_INT, IRQF_TRIGGER_LOW);
-        irq_set_irq_type(AU1550_GPIO201_205_INT, IRQF_TRIGGER_HIGH);
-        /* enable both PCMCIA card irqs in the shared line */
-        alchemy_gpio2_enable_int(201);
-        alchemy_gpio2_enable_int(202);
-        /* Pb1550, like all others, also has statuschange irqs; however they're
-        * wired up on one of the Au1550's shared GPIO201_205 line, which also
-        * services the PCMCIA card interrupts.  So we ignore statuschange and
-        * use the GPIO201_205 exclusively for card interrupts, since a) pcmcia
-        * drivers are used to shared irqs and b) statuschange isn't really use-
-        * ful anyway.
-        */
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x000400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x000010000 - 1,
-                AU1550_GPIO201_205_INT, AU1550_GPIO0_INT, 0, 0, 0);
-        db1x_register_pcmcia_socket(
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008000000,
-                AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008000000,
-                AU1000_PCMCIA_MEM_PHYS_ADDR  + 0x008400000 - 1,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008000000,
-                AU1000_PCMCIA_IO_PHYS_ADDR   + 0x008010000 - 1,
-                AU1550_GPIO201_205_INT, AU1550_GPIO1_INT, 0, 0, 1);
-        /* NAND setup */
-        gpio_direction_input(206);      /* GPIO206 high */
-        pb1550_nand_setup();
-        swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_PB1550_SWAPBOOT;
-        db1x_register_norflash(128 * 1024 * 1024, 4, swapped);
-        platform_device_register(&pb1550_pci_host);
-        platform_device_register(&pb1550_i2c_dev);
-        return 0;
-}
-arch_initcall(pb1550_dev_init);
diff --git a/arch/mips/alchemy/devboards/platform.c b/arch/mips/alchemy/devboards/platform.c
index f39042e99d0..8df86eb9497 100644
--- a/arch/mips/alchemy/devboards/platform.c
+++ b/arch/mips/alchemy/devboards/platform.c
@@ -36,11 +36,10 @@ void __init prom_init(void)
 void prom_putchar(unsigned char c)
 {
-#ifdef CONFIG_MIPS_DB1300
+        if (alchemy_get_cputype() == ALCHEMY_CPU_AU1300)
-        alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
+                alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
-#else
+        else
-        alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
+                alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
-#endif
 }
diff --git a/arch/mips/boot/compressed/uart-alchemy.c b/arch/mips/boot/compressed/uart-alchemy.c
index 3112df8f90d..4bee55b93f6 100644
--- a/arch/mips/boot/compressed/uart-alchemy.c
+++ b/arch/mips/boot/compressed/uart-alchemy.c
@@ -2,9 +2,5 @@
 void putc(char c)
 {
-#ifdef CONFIG_MIPS_DB1300
-        alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);
-#else
        alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
-#endif
 }
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
deleted file mode 100644
index 1f69249b839..00000000000
--- a/arch/mips/configs/db1200_defconfig
+++ /dev/null
@@ -1,170 +0,0 @@
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_DB1200=y
-CONFIG_KSM=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-# CONFIG_SECCOMP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-db1200"
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_PCCARD=y
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_MISC=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_IDE_TASK_IOCTL=y
-# CONFIG_IDE_PROC_FS is not set
-CONFIG_BLK_DEV_IDE_AU1XXX=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMC91X=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=2
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_AU1550=y
-CONFIG_SPI=y
-CONFIG_SPI_AU1550=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_SENSORS_ADM1025=y
-CONFIG_SENSORS_LM70=y
-CONFIG_FB=y
-CONFIG_FB_AU1200=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x16=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_DYNAMIC_MINORS=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_MIPS is not set
-# CONFIG_SND_USB is not set
-# CONFIG_SND_PCMCIA is not set
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_AU1XPSC=y
-CONFIG_SND_SOC_DB1200=y
-CONFIG_HIDRAW=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_MMC=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
-CONFIG_MMC_AU1X=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_EFI_PARTITION=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_FTRACE is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,115200"
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITYFS=y
diff --git a/arch/mips/configs/db1235_defconfig b/arch/mips/configs/db1235_defconfig
new file mode 100644
index 00000000000..c48998ffd19
--- /dev/null
+++ b/arch/mips/configs/db1235_defconfig
@@ -0,0 +1,434 @@
+CONFIG_MIPS_ALCHEMY=y
+CONFIG_MIPS_DB1235=y
+CONFIG_COMPACTION=y
+CONFIG_KSM=y
+CONFIG_HZ_100=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCALVERSION="-db1235"
+CONFIG_KERNEL_LZMA=y
+CONFIG_DEFAULT_HOSTNAME="db1235"
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_FHANDLE=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_AUDIT=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=16
+CONFIG_NAMESPACES=y
+CONFIG_EMBEDDED=y
+CONFIG_SLAB=y
+CONFIG_JUMP_LABEL=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_LDM_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_PCI=y
+CONFIG_PCCARD=y
+CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
+CONFIG_PM_RUNTIME=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=y
+CONFIG_XFRM_USER=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_UDP_DIAG=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=y
+CONFIG_TCP_CONG_HYBLA=y
+CONFIG_TCP_CONG_SCALABLE=y
+CONFIG_TCP_CONG_LP=y
+CONFIG_TCP_CONG_VENO=y
+CONFIG_TCP_CONG_YEAH=y
+CONFIG_TCP_CONG_ILLINOIS=y
+CONFIG_DEFAULT_HYBLA=y
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_MIP6=y
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_TUNNEL=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_H323=y
+CONFIG_NF_CONNTRACK_IRC=y
+CONFIG_NF_CONNTRACK_NETBIOS_NS=y
+CONFIG_NF_CONNTRACK_SNMP=y
+CONFIG_NF_CONNTRACK_PPTP=y
+CONFIG_NF_CONNTRACK_SANE=y
+CONFIG_NF_CONNTRACK_SIP=y
+CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NF_CT_NETLINK=y
+CONFIG_NF_CT_NETLINK_TIMEOUT=y
+CONFIG_NF_CT_NETLINK_HELPER=y
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
+CONFIG_NETFILTER_XT_TARGET_HMARK=y
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
+CONFIG_NETFILTER_XT_TARGET_LED=y
+CONFIG_NETFILTER_XT_TARGET_LOG=y
+CONFIG_NETFILTER_XT_TARGET_MARK=y
+CONFIG_NETFILTER_XT_TARGET_NFLOG=y
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+CONFIG_NETFILTER_XT_TARGET_TEE=y
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=y
+CONFIG_NETFILTER_XT_MATCH_COMMENT=y
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_CPU=y
+CONFIG_NETFILTER_XT_MATCH_DCCP=y
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=y
+CONFIG_NETFILTER_XT_MATCH_DSCP=y
+CONFIG_NETFILTER_XT_MATCH_ESP=y
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
+CONFIG_NETFILTER_XT_MATCH_HELPER=y
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
+CONFIG_NETFILTER_XT_MATCH_LENGTH=y
+CONFIG_NETFILTER_XT_MATCH_LIMIT=y
+CONFIG_NETFILTER_XT_MATCH_MAC=y
+CONFIG_NETFILTER_XT_MATCH_MARK=y
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_NFACCT=y
+CONFIG_NETFILTER_XT_MATCH_OSF=y
+CONFIG_NETFILTER_XT_MATCH_OWNER=y
+CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA=y
+CONFIG_NETFILTER_XT_MATCH_RATEEST=y
+CONFIG_NETFILTER_XT_MATCH_REALM=y
+CONFIG_NETFILTER_XT_MATCH_RECENT=y
+CONFIG_NETFILTER_XT_MATCH_SCTP=y
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
+CONFIG_NETFILTER_XT_MATCH_STRING=y
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_TIME=y
+CONFIG_NETFILTER_XT_MATCH_U32=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_AH=y
+CONFIG_IP_NF_MATCH_ECN=y
+CONFIG_IP_NF_MATCH_RPFILTER=y
+CONFIG_IP_NF_MATCH_TTL=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_ULOG=y
+CONFIG_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_CLUSTERIP=y
+CONFIG_IP_NF_TARGET_ECN=y
+CONFIG_IP_NF_TARGET_TTL=y
+CONFIG_IP_NF_RAW=y
+CONFIG_IP_NF_ARPTABLES=y
+CONFIG_IP_NF_ARPFILTER=y
+CONFIG_IP_NF_ARP_MANGLE=y
+CONFIG_NF_CONNTRACK_IPV6=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_MATCH_AH=y
+CONFIG_IP6_NF_MATCH_EUI64=y
+CONFIG_IP6_NF_MATCH_FRAG=y
+CONFIG_IP6_NF_MATCH_OPTS=y
+CONFIG_IP6_NF_MATCH_HL=y
+CONFIG_IP6_NF_MATCH_IPV6HEADER=y
+CONFIG_IP6_NF_MATCH_MH=y
+CONFIG_IP6_NF_MATCH_RPFILTER=y
+CONFIG_IP6_NF_MATCH_RT=y
+CONFIG_IP6_NF_TARGET_HL=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_TARGET_REJECT=y
+CONFIG_IP6_NF_MANGLE=y
+CONFIG_IP6_NF_RAW=y
+CONFIG_BRIDGE_NF_EBTABLES=y
+CONFIG_BRIDGE_EBT_BROUTE=y
+CONFIG_BRIDGE_EBT_T_FILTER=y
+CONFIG_BRIDGE_EBT_T_NAT=y
+CONFIG_BRIDGE_EBT_802_3=y
+CONFIG_BRIDGE_EBT_AMONG=y
+CONFIG_BRIDGE_EBT_ARP=y
+CONFIG_BRIDGE_EBT_IP=y
+CONFIG_BRIDGE_EBT_IP6=y
+CONFIG_BRIDGE_EBT_LIMIT=y
+CONFIG_BRIDGE_EBT_MARK=y
+CONFIG_BRIDGE_EBT_PKTTYPE=y
+CONFIG_BRIDGE_EBT_STP=y
+CONFIG_BRIDGE_EBT_VLAN=y
+CONFIG_BRIDGE_EBT_ARPREPLY=y
+CONFIG_BRIDGE_EBT_DNAT=y
+CONFIG_BRIDGE_EBT_MARK_T=y
+CONFIG_BRIDGE_EBT_REDIRECT=y
+CONFIG_BRIDGE_EBT_SNAT=y
+CONFIG_BRIDGE_EBT_LOG=y
+CONFIG_BRIDGE_EBT_NFLOG=y
+CONFIG_L2TP=y
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=y
+CONFIG_L2TP_ETH=y
+CONFIG_BRIDGE=y
+CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_LLC2=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_HFSC=y
+CONFIG_NET_SCH_PRIO=y
+CONFIG_NET_SCH_MULTIQ=y
+CONFIG_NET_SCH_RED=y
+CONFIG_NET_SCH_SFB=y
+CONFIG_NET_SCH_SFQ=y
+CONFIG_NET_SCH_TEQL=y
+CONFIG_NET_SCH_TBF=y
+CONFIG_NET_SCH_GRED=y
+CONFIG_NET_SCH_DSMARK=y
+CONFIG_NET_SCH_NETEM=y
+CONFIG_NET_SCH_DRR=y
+CONFIG_NET_SCH_MQPRIO=y
+CONFIG_NET_SCH_CHOKE=y
+CONFIG_NET_SCH_QFQ=y
+CONFIG_NET_SCH_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_SCH_PLUG=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_TCINDEX=y
+CONFIG_NET_CLS_ROUTE4=y
+CONFIG_NET_CLS_FW=y
+CONFIG_NET_CLS_U32=y
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=y
+CONFIG_NET_CLS_RSVP6=y
+CONFIG_NET_CLS_FLOW=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=y
+CONFIG_NET_EMATCH_NBYTE=y
+CONFIG_NET_EMATCH_U32=y
+CONFIG_NET_EMATCH_META=y
+CONFIG_NET_EMATCH_TEXT=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=y
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=y
+CONFIG_NET_ACT_NAT=y
+CONFIG_NET_ACT_PEDIT=y
+CONFIG_NET_ACT_SIMP=y
+CONFIG_NET_ACT_SKBEDIT=y
+CONFIG_NET_ACT_CSUM=y
+CONFIG_NET_CLS_IND=y
+CONFIG_BT=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=y
+CONFIG_BT_HCIBTUSB=y
+CONFIG_CFG80211=y
+CONFIG_CFG80211_CERTIFICATION_ONUS=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_PLATFORM=y
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE_AU1XXX=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_ATA=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_PCMCIA=y
+CONFIG_PATA_PLATFORM=y
+CONFIG_NETDEVICES=y
+CONFIG_MIPS_AU1X00_ENET=y
+CONFIG_SMC91X=y
+CONFIG_SMSC911X=y
+CONFIG_AMD_PHY=y
+CONFIG_SMSC_PHY=y
+CONFIG_RT2X00=y
+CONFIG_RT73USB=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_WM97XX=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_TTY_PRINTK=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_AU1550=y
+CONFIG_SPI=y
+CONFIG_SPI_AU1550=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_SENSORS_ADM1025=y
+CONFIG_SENSORS_LM70=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HRTIMER=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_AU1XPSC=y
+CONFIG_SND_SOC_DB1200=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=y
+CONFIG_USB_HIDDEV=y
+CONFIG_USB=y
+CONFIG_USB_DYNAMIC_MINORS=y
+CONFIG_USB_SUSPEND=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_MMC=y
+CONFIG_MMC_CLKGATE=y
+CONFIG_MMC_AU1X=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AU1XXX=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_XFS_FS=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_CODEPAGE_852=y
+CONFIG_NLS_CODEPAGE_1250=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_NLS_UTF8=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_SECURITYFS=y
+CONFIG_CRYPTO_USER=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_CRYPTD=y
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_PCBC=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_XCBC=y
+CONFIG_CRYPTO_VMAC=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=y
+CONFIG_CRYPTO_RMD160=y
+CONFIG_CRYPTO_RMD256=y
+CONFIG_CRYPTO_RMD320=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_ANUBIS=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_FCRYPT=y
+CONFIG_CRYPTO_KHAZAD=y
+CONFIG_CRYPTO_SALSA20=y
+CONFIG_CRYPTO_SEED=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_TEA=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_ZLIB=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
diff --git a/arch/mips/configs/db1300_defconfig b/arch/mips/configs/db1300_defconfig
deleted file mode 100644
index 3590ab5d979..00000000000
--- a/arch/mips/configs/db1300_defconfig
+++ /dev/null
@@ -1,391 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_ALCHEMY_GPIOINT_AU1300=y
-CONFIG_MIPS_DB1300=y
-CONFIG_SOC_AU1300=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_CEVT_R4K_LIB=y
-CONFIG_CSRC_R4K_LIB=y
-CONFIG_DMA_COHERENT=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_IRQ_CPU=y
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-CONFIG_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_ZBOOT=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPSR1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-CONFIG_32BIT=y
-CONFIG_PAGE_SIZE_4KB=y
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_MIPS_MT_DISABLED=y
-CONFIG_64BIT_PHYS_ADDR=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_HZ_100=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=100
-CONFIG_PREEMPT_NONE=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-CONFIG_HAVE_IRQ_WORK=y
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-db1300"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_LZMA=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_FHANDLE=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_EMBEDDED=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_SLAB=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-# CONFIG_UNINLINE_SPIN_UNLOCK is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_MMU=y
-CONFIG_PCCARD=y
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_TRAD_SIGNALS=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_INET_TUNNEL=y
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_IPV6=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-CONFIG_IPV6_SIT=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_IDE_TASK_IOCTL=y
-CONFIG_IDE_PROC_FS=y
-CONFIG_BLK_DEV_PLATFORM=y
-CONFIG_SCSI_MOD=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_PHYLIB=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMSC911X=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM97XX=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_SMBUS=y
-CONFIG_I2C_AU1550=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_AU1550=y
-CONFIG_SPI_BITBANG=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=y
-CONFIG_SENSORS_ADM1025=y
-CONFIG_FB=y
-CONFIG_FB_AU1200=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_ACORN_8x8=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_JACK=y
-CONFIG_SND_HRTIMER=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_VERBOSE_PRINTK=y
-CONFIG_SND_VMASTER=y
-CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_AU1XPSC=y
-CONFIG_SND_SOC_AU1XPSC_I2S=y
-CONFIG_SND_SOC_AU1XPSC_AC97=y
-CONFIG_SND_SOC_DB1300=y
-CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_WM8731=y
-CONFIG_SND_SOC_WM9712=y
-CONFIG_AC97_BUS=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-CONFIG_HIDRAW=y
-CONFIG_USB_HID=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=y
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_GENERIC_ACL=y
-CONFIG_FAT_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_JFFS2_CMODE_PRIORITY=y
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_XZ=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_PRINTK_TIME=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="video=au1200fb:panel:bs console=tty console=ttyS2,115200"
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-CONFIG_BITREVERSE=y
-CONFIG_CRC32=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_NLATTR=y
-CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
deleted file mode 100644
index 36cda27725e..00000000000
--- a/arch/mips/configs/db1550_defconfig
+++ /dev/null
@@ -1,285 +0,0 @@
-CONFIG_MIPS=y
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_DB1550=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-CONFIG_HZ=100
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-db1550"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_KERNEL_LZMA=y
-CONFIG_DEFAULT_HOSTNAME="db1550"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_EXPERT=y
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_EMBEDDED=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLAB=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_IOSCHED_NOOP=y
-CONFIG_DEFAULT_NOOP=y
-CONFIG_DEFAULT_IOSCHED="noop"
-CONFIG_PCI=y
-CONFIG_PCCARD=y
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_MISC=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_INET_TUNNEL=y
-CONFIG_INET_LRO=y
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_IPV6=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-CONFIG_IPV6_SIT=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_DNS_RESOLVER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_IDS=y
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_MISC_DEVICES=y
-CONFIG_EEPROM_AT24=y
-CONFIG_SCSI_MOD=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_ATA=y
-CONFIG_ATA_SFF=y
-CONFIG_ATA_BMDMA=y
-CONFIG_PATA_HPT37X=y
-CONFIG_PATA_PCMCIA=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_PHYLIB=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MIPS_AU1X00_ENET=y
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=y
-CONFIG_PCMCIA_PCNET=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_DEVKMEM=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_DEVPORT=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_AU1550=y
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_AU1550=y
-CONFIG_SPI_BITBANG=y
-CONFIG_HWMON=y
-CONFIG_SENSORS_ADM1025=y
-CONFIG_SENSORS_LM70=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_JACK=y
-CONFIG_SND_VMASTER=y
-CONFIG_SND_AC97_CODEC=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_AC97_BUS=y
-CONFIG_SND_SOC_AU1XPSC=y
-CONFIG_SND_SOC_AU1XPSC_I2S=y
-CONFIG_SND_SOC_AU1XPSC_AC97=y
-CONFIG_SND_SOC_DB1200=y
-CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_AC97_CODEC=y
-CONFIG_SND_SOC_WM8731=y
-CONFIG_SND_SOC_WM9712=y
-CONFIG_AC97_BUS=y
-CONFIG_USB=y
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_JBD2=y
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_JFFS2_CMODE_PRIORITY=y
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_NFS_V4_1=y
-CONFIG_PNFS_FILE_LAYOUT=y
-CONFIG_PNFS_BLOCK=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_USE_NEW_IDMAPPER=y
-CONFIG_NFSD=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_FRAME_WARN=1024
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="noirqdebug console=ttyS0,115200 root=/dev/sda1 rootfstype=ext4"
-CONFIG_KEYS=y
-CONFIG_SECURITYFS=y
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_BITREVERSE=y
-CONFIG_CRC16=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_BCH=y
-CONFIG_NLATTR=y
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
deleted file mode 100644
index 75eb1b1f316..00000000000
--- a/arch/mips/configs/pb1100_defconfig
+++ /dev/null
@@ -1,124 +0,0 @@
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_PB1100=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-# CONFIG_SECCOMP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-pb1100"
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_PCCARD=y
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_IDE_TASK_IOCTL=y
-# CONFIG_IDE_PROC_FS is not set
-CONFIG_NETDEVICES=y
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_STE10XP=y
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_HIDRAW=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-# CONFIG_JFFS2_FS_POSIX_ACL is not set
-# CONFIG_JFFS2_FS_SECURITY is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITYFS=y
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
deleted file mode 100644
index fa00487146f..00000000000
--- a/arch/mips/configs/pb1500_defconfig
+++ /dev/null
@@ -1,141 +0,0 @@
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_PB1500=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-# CONFIG_SECCOMP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-pb1500"
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_PCI=y
-CONFIG_PCCARD=y
-# CONFIG_CARDBUS is not set
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_IDE_TASK_IOCTL=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_NETDEVICES=y
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_STE10XP=y
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_PCI is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_ARB is not set
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_S1D13XXX=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITYFS=y
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
deleted file mode 100644
index e83d6497e8b..00000000000
--- a/arch/mips/configs/pb1550_defconfig
+++ /dev/null
@@ -1,145 +0,0 @@
-CONFIG_MIPS_ALCHEMY=y
-CONFIG_MIPS_PB1550=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-# CONFIG_SECCOMP is not set
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-pb1550"
-CONFIG_KERNEL_LZMA=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_PCI=y
-CONFIG_PCCARD=y
-# CONFIG_CARDBUS is not set
-CONFIG_PCMCIA_ALCHEMY_DEVBOARD=y
-CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_AU1550=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_UB=y
-# CONFIG_MISC_DEVICES is not set
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_BLK_DEV_IDECD=y
-# CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS is not set
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_NETDEVICES=y
-CONFIG_MARVELL_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_VITESSE_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_STE10XP=y
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_PCI is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_AU1550=y
-# CONFIG_HWMON is not set
-# CONFIG_VGA_ARB is not set
-CONFIG_HIDRAW=y
-CONFIG_USB_HIDDEV=y
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AU1XXX=y
-CONFIG_EXT2_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_SQUASHFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_CODEPAGE_1250=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_ZBOOT=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITYFS=y
diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index f53f9ca7399..e69de29bb2d 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -1,5 +0,0 @@
-include include/asm-generic/Kbuild.asm
-header-y += cachectl.h
-header-y += sgidefs.h
-header-y += sysmips.h
diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
index 3f4c5cb6433..01cc6ba6483 100644
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
@@ -59,8 +59,8 @@ static __inline__ void atomic_add(int i, atomic_t * v)
                "       sc      %0, %1                                  \n"
                "       beqzl   %0, 1b                                  \n"
                "       .set    mips0                                   \n"
-                : "=&r" (temp), "=m" (v->counter)
+                : "=&r" (temp), "+m" (v->counter)
-                : "Ir" (i), "m" (v->counter));
+                : "Ir" (i));
        } else if (kernel_uses_llsc) {
                int temp;
@@ -71,8 +71,8 @@ static __inline__ void atomic_add(int i, atomic_t * v)
                        "       addu    %0, %2                          \n"
                        "       sc      %0, %1                          \n"
                        "       .set    mips0                           \n"
-                        : "=&r" (temp), "=m" (v->counter)
+                        : "=&r" (temp), "+m" (v->counter)
-                        : "Ir" (i), "m" (v->counter));
+                        : "Ir" (i));
                } while (unlikely(!temp));
        } else {
                unsigned long flags;
@@ -102,8 +102,8 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
                "       sc      %0, %1                                  \n"
                "       beqzl   %0, 1b                                  \n"
                "       .set    mips0                                   \n"
-                : "=&r" (temp), "=m" (v->counter)
+                : "=&r" (temp), "+m" (v->counter)
-                : "Ir" (i), "m" (v->counter));
+                : "Ir" (i));
        } else if (kernel_uses_llsc) {
                int temp;
@@ -114,8 +114,8 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
                        "       subu    %0, %2                          \n"
                        "       sc      %0, %1                          \n"
                        "       .set    mips0                           \n"
-                        : "=&r" (temp), "=m" (v->counter)
+                        : "=&r" (temp), "+m" (v->counter)
-                        : "Ir" (i), "m" (v->counter));
+                        : "Ir" (i));
                } while (unlikely(!temp));
        } else {
                unsigned long flags;
@@ -146,9 +146,8 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
                "       beqzl   %0, 1b                                  \n"
                "       addu    %0, %1, %3                              \n"
                "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-                : "Ir" (i), "m" (v->counter)
+                : "Ir" (i));
-                : "memory");
        } else if (kernel_uses_llsc) {
                int temp;
@@ -159,9 +158,8 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
                        "       addu    %0, %1, %3                      \n"
                        "       sc      %0, %2                          \n"
                        "       .set    mips0                           \n"
-                        : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+                        : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-                        : "Ir" (i), "m" (v->counter)
+                        : "Ir" (i));
-                        : "memory");
                } while (unlikely(!result));
                result = temp + i;
@@ -212,9 +210,8 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
                        "       subu    %0, %1, %3                      \n"
                        "       sc      %0, %2                          \n"
                        "       .set    mips0                           \n"
-                        : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+                        : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-                        : "Ir" (i), "m" (v->counter)
+                        : "Ir" (i));
-                        : "memory");
                } while (unlikely(!result));
                result = temp - i;
@@ -262,7 +259,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
                "       .set    reorder                                 \n"
                "1:                                                     \n"
                "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
                : "Ir" (i), "m" (v->counter)
                : "memory");
        } else if (kernel_uses_llsc) {
@@ -280,9 +277,8 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
                "       .set    reorder                                 \n"
                "1:                                                     \n"
                "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-                : "Ir" (i), "m" (v->counter)
+                : "Ir" (i));
-                : "memory");
        } else {
                unsigned long flags;
@@ -430,8 +426,8 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
                "       scd     %0, %1                                  \n"
                "       beqzl   %0, 1b                                  \n"
                "       .set    mips0                                   \n"
-                : "=&r" (temp), "=m" (v->counter)
+                : "=&r" (temp), "+m" (v->counter)
-                : "Ir" (i), "m" (v->counter));
+                : "Ir" (i));
        } else if (kernel_uses_llsc) {
                long temp;
@@ -442,8 +438,8 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
                        "       daddu   %0, %2                          \n"
                        "       scd     %0, %1                          \n"
                        "       .set    mips0                           \n"
-                        : "=&r" (temp), "=m" (v->counter)
+                        : "=&r" (temp), "+m" (v->counter)
-                        : "Ir" (i), "m" (v->counter));
+                        : "Ir" (i));
                } while (unlikely(!temp));
        } else {
                unsigned long flags;
@@ -473,8 +469,8 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
                "       scd     %0, %1                                  \n"
                "       beqzl   %0, 1b                                  \n"
                "       .set    mips0                                   \n"
-                : "=&r" (temp), "=m" (v->counter)
+                : "=&r" (temp), "+m" (v->counter)
-                : "Ir" (i), "m" (v->counter));
+                : "Ir" (i));
        } else if (kernel_uses_llsc) {
                long temp;
@@ -485,8 +481,8 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
                        "       dsubu   %0, %2                          \n"
                        "       scd     %0, %1                          \n"
                        "       .set    mips0                           \n"
-                        : "=&r" (temp), "=m" (v->counter)
+                        : "=&r" (temp), "+m" (v->counter)
-                        : "Ir" (i), "m" (v->counter));
+                        : "Ir" (i));
                } while (unlikely(!temp));
        } else {
                unsigned long flags;
@@ -517,9 +513,8 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
                "       beqzl   %0, 1b                                  \n"
                "       daddu   %0, %1, %3                              \n"
                "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-                : "Ir" (i), "m" (v->counter)
+                : "Ir" (i));
-                : "memory");
        } else if (kernel_uses_llsc) {
                long temp;
@@ -649,9 +644,8 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
                "       .set    reorder                                 \n"
                "1:                                                     \n"
                "       .set    mips0                                   \n"
-                : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+                : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-                : "Ir" (i), "m" (v->counter)
+                : "Ir" (i));
-                : "memory");
        } else {
                unsigned long flags;
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index 63002a240c7..c507b931b48 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -171,6 +171,10 @@
 #define cpu_has_dsp             (cpu_data[0].ases & MIPS_ASE_DSP)
 #endif
+#ifndef cpu_has_dsp2
+#define cpu_has_dsp2            (cpu_data[0].ases & MIPS_ASE_DSP2P)
+#endif
 #ifndef cpu_has_mipsmt
 #define cpu_has_mipsmt          (cpu_data[0].ases & MIPS_ASE_MIPSMT)
 #endif
@@ -252,4 +256,8 @@
 #define cpu_hwrena_impl_bits            0
 #endif
+#ifndef cpu_has_perf_cntr_intr_bit
+#define cpu_has_perf_cntr_intr_bit      (cpu_data[0].options & MIPS_CPU_PCI)
+#endif
 #endif /* __ASM_CPU_FEATURES_H */
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 554e2d29965..52c4e914f95 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -320,7 +320,8 @@ enum cpu_type_enum {
 #define MIPS_CPU_VINT           0x00080000 /* CPU supports MIPSR2 vectored interrupts */
 #define MIPS_CPU_VEIC           0x00100000 /* CPU supports MIPSR2 external interrupt controller mode */
 #define MIPS_CPU_ULRI           0x00200000 /* CPU has ULRI feature */
-#define MIPS_CPU_RIXI           0x00400000 /* CPU has TLB Read/eXec Inhibit */
+#define MIPS_CPU_PCI            0x00400000 /* CPU has Perf Ctr Int indicator */
+#define MIPS_CPU_RIXI           0x00800000 /* CPU has TLB Read/eXec Inhibit */
 /*
 * CPU ASE encodings
@@ -331,6 +332,7 @@ enum cpu_type_enum {
 #define MIPS_ASE_SMARTMIPS      0x00000008 /* SmartMIPS */
 #define MIPS_ASE_DSP            0x00000010 /* Signal Processing ASE */
 #define MIPS_ASE_MIPSMT         0x00000020 /* CPU supports MIPS MT */
+#define MIPS_ASE_DSP2P          0x00000040 /* Signal Processing ASE Rev 2 */
 #endif /* _ASM_CPU_H */
diff --git a/arch/mips/include/asm/errno.h b/arch/mips/include/asm/errno.h
index 6dcd3583ed0..21d91cdfe3c 100644
--- a/arch/mips/include/asm/errno.h
+++ b/arch/mips/include/asm/errno.h
@@ -8,128 +8,10 @@
 #ifndef _ASM_ERRNO_H
 #define _ASM_ERRNO_H
-/*
+#include <uapi/asm/errno.h>
- * These error numbers are intended to be MIPS ABI compatible
- */
-#include <asm-generic/errno-base.h>
-#define ENOMSG          35      /* No message of desired type */
-#define EIDRM           36      /* Identifier removed */
-#define ECHRNG          37      /* Channel number out of range */
-#define EL2NSYNC        38      /* Level 2 not synchronized */
-#define EL3HLT          39      /* Level 3 halted */
-#define EL3RST          40      /* Level 3 reset */
-#define ELNRNG          41      /* Link number out of range */
-#define EUNATCH         42      /* Protocol driver not attached */
-#define ENOCSI          43      /* No CSI structure available */
-#define EL2HLT          44      /* Level 2 halted */
-#define EDEADLK         45      /* Resource deadlock would occur */
-#define ENOLCK          46      /* No record locks available */
-#define EBADE           50      /* Invalid exchange */
-#define EBADR           51      /* Invalid request descriptor */
-#define EXFULL          52      /* Exchange full */
-#define ENOANO          53      /* No anode */
-#define EBADRQC         54      /* Invalid request code */
-#define EBADSLT         55      /* Invalid slot */
-#define EDEADLOCK       56      /* File locking deadlock error */
-#define EBFONT          59      /* Bad font file format */
-#define ENOSTR          60      /* Device not a stream */
-#define ENODATA         61      /* No data available */
-#define ETIME           62      /* Timer expired */
-#define ENOSR           63      /* Out of streams resources */
-#define ENONET          64      /* Machine is not on the network */
-#define ENOPKG          65      /* Package not installed */
-#define EREMOTE         66      /* Object is remote */
-#define ENOLINK         67      /* Link has been severed */
-#define EADV            68      /* Advertise error */
-#define ESRMNT          69      /* Srmount error */
-#define ECOMM           70      /* Communication error on send */
-#define EPROTO          71      /* Protocol error */
-#define EDOTDOT         73      /* RFS specific error */
-#define EMULTIHOP       74      /* Multihop attempted */
-#define EBADMSG         77      /* Not a data message */
-#define ENAMETOOLONG    78      /* File name too long */
-#define EOVERFLOW       79      /* Value too large for defined data type */
-#define ENOTUNIQ        80      /* Name not unique on network */
-#define EBADFD          81      /* File descriptor in bad state */
-#define EREMCHG         82      /* Remote address changed */
-#define ELIBACC         83      /* Can not access a needed shared library */
-#define ELIBBAD         84      /* Accessing a corrupted shared library */
-#define ELIBSCN         85      /* .lib section in a.out corrupted */
-#define ELIBMAX         86      /* Attempting to link in too many shared libraries */
-#define ELIBEXEC        87      /* Cannot exec a shared library directly */
-#define EILSEQ          88      /* Illegal byte sequence */
-#define ENOSYS          89      /* Function not implemented */
-#define ELOOP           90      /* Too many symbolic links encountered */
-#define ERESTART        91      /* Interrupted system call should be restarted */
-#define ESTRPIPE        92      /* Streams pipe error */
-#define ENOTEMPTY       93      /* Directory not empty */
-#define EUSERS          94      /* Too many users */
-#define ENOTSOCK        95      /* Socket operation on non-socket */
-#define EDESTADDRREQ    96      /* Destination address required */
-#define EMSGSIZE        97      /* Message too long */
-#define EPROTOTYPE      98      /* Protocol wrong type for socket */
-#define ENOPROTOOPT     99      /* Protocol not available */
-#define EPROTONOSUPPORT 120     /* Protocol not supported */
-#define ESOCKTNOSUPPORT 121     /* Socket type not supported */
-#define EOPNOTSUPP      122     /* Operation not supported on transport endpoint */
-#define EPFNOSUPPORT    123     /* Protocol family not supported */
-#define EAFNOSUPPORT    124     /* Address family not supported by protocol */
-#define EADDRINUSE      125     /* Address already in use */
-#define EADDRNOTAVAIL   126     /* Cannot assign requested address */
-#define ENETDOWN        127     /* Network is down */
-#define ENETUNREACH     128     /* Network is unreachable */
-#define ENETRESET       129     /* Network dropped connection because of reset */
-#define ECONNABORTED    130     /* Software caused connection abort */
-#define ECONNRESET      131     /* Connection reset by peer */
-#define ENOBUFS         132     /* No buffer space available */
-#define EISCONN         133     /* Transport endpoint is already connected */
-#define ENOTCONN        134     /* Transport endpoint is not connected */
-#define EUCLEAN         135     /* Structure needs cleaning */
-#define ENOTNAM         137     /* Not a XENIX named type file */
-#define ENAVAIL         138     /* No XENIX semaphores available */
-#define EISNAM          139     /* Is a named type file */
-#define EREMOTEIO       140     /* Remote I/O error */
-#define EINIT           141     /* Reserved */
-#define EREMDEV         142     /* Error 142 */
-#define ESHUTDOWN       143     /* Cannot send after transport endpoint shutdown */
-#define ETOOMANYREFS    144     /* Too many references: cannot splice */
-#define ETIMEDOUT       145     /* Connection timed out */
-#define ECONNREFUSED    146     /* Connection refused */
-#define EHOSTDOWN       147     /* Host is down */
-#define EHOSTUNREACH    148     /* No route to host */
-#define EWOULDBLOCK     EAGAIN  /* Operation would block */
-#define EALREADY        149     /* Operation already in progress */
-#define EINPROGRESS     150     /* Operation now in progress */
-#define ESTALE          151     /* Stale NFS file handle */
-#define ECANCELED       158     /* AIO operation canceled */
-/*
- * These error are Linux extensions.
- */
-#define ENOMEDIUM       159     /* No medium found */
-#define EMEDIUMTYPE     160     /* Wrong medium type */
-#define ENOKEY          161     /* Required key not available */
-#define EKEYEXPIRED     162     /* Key has expired */
-#define EKEYREVOKED     163     /* Key has been revoked */
-#define EKEYREJECTED    164     /* Key was rejected by service */
-/* for robust mutexes */
-#define EOWNERDEAD      165     /* Owner died */
-#define ENOTRECOVERABLE 166     /* State not recoverable */
-#define ERFKILL         167     /* Operation not possible due to RF-kill */
-#define EHWPOISON       168     /* Memory page has hardware error */
-#define EDQUOT          1133    /* Quota exceeded */
-#ifdef __KERNEL__
 /* The biggest error number defined here or in <linux/errno.h>. */
 #define EMAXERRNO       1133
-#endif /* __KERNEL__ */
 #endif /* _ASM_ERRNO_H */
diff --git a/arch/mips/include/asm/kspd.h b/arch/mips/include/asm/kspd.h
index 4e9e724c893..ec6832950ac 100644
--- a/arch/mips/include/asm/kspd.h
+++ b/arch/mips/include/asm/kspd.h
@@ -25,12 +25,8 @@ struct kspd_notifications {
        struct list_head list;
 };
-#ifdef CONFIG_MIPS_APSP_KSPD
-extern void kspd_notify(struct kspd_notifications *notify);
-#else
 static inline void kspd_notify(struct kspd_notifications *notify)
 {
 }
-#endif
 #endif
diff --git a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
index 6ddae926bf7..ea4b66dccf6 100644
--- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
@@ -42,6 +42,8 @@
 #define cpu_has_mips64r1        0
 #define cpu_has_mips64r2        0
+#define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_64bits          0
diff --git a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h b/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h
index 3f741af37d4..09f45e6afad 100644
--- a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h
@@ -37,6 +37,7 @@
 #define cpu_has_mips64r1                0
 #define cpu_has_mips64r2                0
 #define cpu_has_dsp                     0
+#define cpu_has_dsp2                    0
 #define cpu_has_mipsmt                  0
 #define cpu_has_userlocal               0
 #define cpu_has_nofpuex                 0
diff --git a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
index f453c01d067..e9c408e8ff4 100644
--- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
@@ -37,6 +37,7 @@
 #define cpu_has_mips64r2                0
 #define cpu_has_dsp                     0
+#define cpu_has_dsp2                    0
 #define cpu_has_mipsmt                  0
 #define cpu_has_userlocal               0
diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
index 375ad0c815f..94ed063eec9 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
@@ -53,6 +53,7 @@
 #define cpu_has_mips64r2        1
 #define cpu_has_mips_r2_exec_hazard 0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_vint            0
 #define cpu_has_veic            0
diff --git a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
index b3314cf5319..babc8374e37 100644
--- a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
@@ -45,6 +45,7 @@
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_icache_snoops_remote_store  0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-db1x00/bcsr.h b/arch/mips/include/asm/mach-db1x00/bcsr.h
index bb9fc23d853..16f1cf5982b 100644
--- a/arch/mips/include/asm/mach-db1x00/bcsr.h
+++ b/arch/mips/include/asm/mach-db1x00/bcsr.h
@@ -162,6 +162,8 @@ enum bcsr_whoami_boards {
 #define BCSR_BOARD_PCIEXTARB            0x0200
 #define BCSR_BOARD_GPIO200RST           0x0400
 #define BCSR_BOARD_PCICLKOUT            0x0800
+#define BCSR_BOARD_PB1100_SD0PWR        0x0400
+#define BCSR_BOARD_PB1100_SD1PWR        0x0800
 #define BCSR_BOARD_PCICFG               0x1000
 #define BCSR_BOARD_SPISEL               0x2000  /* PB/DB1550 */
 #define BCSR_BOARD_SD0WP                0x4000  /* DB1100 */
diff --git a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
index 9c8735158da..f4caacd2555 100644
--- a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
@@ -30,6 +30,7 @@
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
index 7d3112b148d..1d2b6ff60d3 100644
--- a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
@@ -26,6 +26,7 @@
 #define cpu_has_dc_aliases      0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_icache_snoops_remote_store  1
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
index 9a53b326f84..50d344ca60a 100644
--- a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
@@ -27,6 +27,7 @@
 #define cpu_has_dc_aliases      0 /* see probe_pcache() */
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_icache_snoops_remote_store  1
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
index 6782fccebe8..2e1ec6cfedd 100644
--- a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h
@@ -37,6 +37,7 @@
 #define cpu_has_vtag_icache     0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_4k_cache        1
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h b/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
index d12e5c6477b..a225baaa215 100644
--- a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
@@ -38,6 +38,7 @@
 #define cpu_has_mips64r1        0
 #define cpu_has_mips64r2        0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
 #define cpu_has_nofpuex 0
diff --git a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
index 675bd8641d5..1a05d854e34 100644
--- a/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h
@@ -32,6 +32,7 @@
 #define cpu_has_dc_aliases      (PAGE_SIZE < 0x4000)
 #define cpu_has_divec           0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_ejtag           0
 #define cpu_has_fpu             1
 #define cpu_has_ic_fills_f_dc   0
diff --git a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
index 966db4be377..091deb1700e 100644
--- a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
@@ -26,6 +26,7 @@
 #define cpu_has_vtag_icache     0
 #define cpu_has_ic_fills_f_dc   1
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_icache_snoops_remote_store  1
diff --git a/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h b/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
index f751e3ec56f..58c76ec32a1 100644
--- a/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
@@ -45,6 +45,7 @@
 #define cpu_has_mips64r1                0
 #define cpu_has_mips64r2                0
 #define cpu_has_dsp                     0
+#define cpu_has_dsp2                    0
 #define cpu_has_mipsmt                  0
 #define cpu_has_userlocal               0
 #define cpu_has_nofpuex                 0
diff --git a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
index c3e4d3a4c95..b15307597ee 100644
--- a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h
@@ -60,6 +60,7 @@
 #define cpu_has_mips64r2                0
 #define cpu_has_dsp                     0
+#define cpu_has_dsp2                    0
 #define cpu_has_mipsmt                  0
 /* #define cpu_has_nofpuex              ? */
diff --git a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
index ccf54336353..f095c529c48 100644
--- a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h
@@ -30,6 +30,7 @@
 #define cpu_has_dc_aliases      (PAGE_SIZE < 0x4000)
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_nofpuex         0
 #define cpu_has_64bits          1
 #define cpu_has_mipsmt          0
diff --git a/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h
index 1c1f92415b9..92927b62b5a 100644
--- a/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h
@@ -26,6 +26,7 @@
 #define cpu_has_dc_aliases      0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
 #define cpu_icache_snoops_remote_store  0
diff --git a/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
index 275eaf92c74..7f5144c6ce2 100644
--- a/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
@@ -12,6 +12,7 @@
 #define cpu_has_vtag_icache     0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp     0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt  0
 #define cpu_has_userlocal       0
diff --git a/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h b/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h
index 470e5e9e10d..56bdd329860 100644
--- a/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h
@@ -26,6 +26,7 @@
 #define cpu_has_dc_aliases      0
 #define cpu_has_ic_fills_f_dc   0
 #define cpu_has_dsp             0
+#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 #define cpu_has_userlocal       0
 #define cpu_icache_snoops_remote_store  0
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 528fda1e957..eb742895dcb 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -458,6 +458,8 @@
 #define  CAUSEF_IP7             (_ULCAST_(1)   << 15)
 #define  CAUSEB_IV              23
 #define  CAUSEF_IV              (_ULCAST_(1)   << 23)
+#define  CAUSEB_PCI             26
+#define  CAUSEF_PCI             (_ULCAST_(1)   << 26)
 #define  CAUSEB_CE              28
 #define  CAUSEF_CE              (_ULCAST_(3)   << 28)
 #define  CAUSEB_TI              30
@@ -590,6 +592,7 @@
 #define MIPS_CONF3_VEIC         (_ULCAST_(1) <<  6)
 #define MIPS_CONF3_LPA          (_ULCAST_(1) <<  7)
 #define MIPS_CONF3_DSP          (_ULCAST_(1) << 10)
+#define MIPS_CONF3_DSP2P        (_ULCAST_(1) << 11)
 #define MIPS_CONF3_RXI          (_ULCAST_(1) << 12)
 #define MIPS_CONF3_ULRI         (_ULCAST_(1) << 13)
diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
index 55908fd56b1..c26e1825007 100644
--- a/arch/mips/include/asm/pgtable-64.h
+++ b/arch/mips/include/asm/pgtable-64.h
@@ -162,7 +162,6 @@ typedef struct { unsigned long pmd; } pmd_t;
 extern pmd_t invalid_pmd_table[PTRS_PER_PMD];
-extern pmd_t empty_bad_pmd_table[PTRS_PER_PMD];
 #endif
 /*
diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h b/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h
index a80801b094b..016fa9446ba 100644
--- a/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/pmc-sierra/msp71xx/cpu-feature-overrides.h
@@ -10,6 +10,7 @@
 #define cpu_has_mips16          1
 #define cpu_has_dsp             1
+/* #define cpu_has_dsp2         ??? - do runtime detection */
 #define cpu_has_mipsmt          1
 #define cpu_has_fpu             0
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h
index 4b7f5252d2f..4f5da948a77 100644
--- a/arch/mips/include/asm/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
@@ -9,115 +9,12 @@
 #ifndef _ASM_PTRACE_H
 #define _ASM_PTRACE_H
-/* 0 - 31 are integer registers, 32 - 63 are fp registers.  */
-#define FPR_BASE        32
-#define PC              64
-#define CAUSE           65
-#define BADVADDR        66
-#define MMHI            67
-#define MMLO            68
-#define FPC_CSR         69
-#define FPC_EIR         70
-#define DSP_BASE        71              /* 3 more hi / lo register pairs */
-#define DSP_CONTROL     77
-#define ACX             78
-/*
- * This struct defines the way the registers are stored on the stack during a
- * system call/exception. As usual the registers k0/k1 aren't being saved.
- */
-struct pt_regs {
-#ifdef CONFIG_32BIT
-        /* Pad bytes for argument save space on the stack. */
-        unsigned long pad0[6];
-#endif
-        /* Saved main processor registers. */
-        unsigned long regs[32];
-        /* Saved special registers. */
-        unsigned long cp0_status;
-        unsigned long hi;
-        unsigned long lo;
-#ifdef CONFIG_CPU_HAS_SMARTMIPS
-        unsigned long acx;
-#endif
-        unsigned long cp0_badvaddr;
-        unsigned long cp0_cause;
-        unsigned long cp0_epc;
-#ifdef CONFIG_MIPS_MT_SMTC
-        unsigned long cp0_tcstatus;
-#endif /* CONFIG_MIPS_MT_SMTC */
-#ifdef CONFIG_CPU_CAVIUM_OCTEON
-        unsigned long long mpl[3];        /* MTM{0,1,2} */
-        unsigned long long mtp[3];        /* MTP{0,1,2} */
-#endif
-} __attribute__ ((aligned (8)));
-/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
-#define PTRACE_GETREGS          12
-#define PTRACE_SETREGS          13
-#define PTRACE_GETFPREGS                14
-#define PTRACE_SETFPREGS                15
-/* #define PTRACE_GETFPXREGS            18 */
-/* #define PTRACE_SETFPXREGS            19 */
-#define PTRACE_OLDSETOPTIONS    21
-#define PTRACE_GET_THREAD_AREA  25
-#define PTRACE_SET_THREAD_AREA  26
-/* Calls to trace a 64bit program from a 32bit program.  */
-#define PTRACE_PEEKTEXT_3264    0xc0
-#define PTRACE_PEEKDATA_3264    0xc1
-#define PTRACE_POKETEXT_3264    0xc2
-#define PTRACE_POKEDATA_3264    0xc3
-#define PTRACE_GET_THREAD_AREA_3264     0xc4
-/* Read and write watchpoint registers.  */
-enum pt_watch_style {
-        pt_watch_style_mips32,
-        pt_watch_style_mips64
-};
-struct mips32_watch_regs {
-        unsigned int watchlo[8];
-        /* Lower 16 bits of watchhi. */
-        unsigned short watchhi[8];
-        /* Valid mask and I R W bits.
-         * bit 0 -- 1 if W bit is usable.
-         * bit 1 -- 1 if R bit is usable.
-         * bit 2 -- 1 if I bit is usable.
-         * bits 3 - 11 -- Valid watchhi mask bits.
-         */
-        unsigned short watch_masks[8];
-        /* The number of valid watch register pairs.  */
-        unsigned int num_valid;
-} __attribute__((aligned(8)));
-struct mips64_watch_regs {
-        unsigned long long watchlo[8];
-        unsigned short watchhi[8];
-        unsigned short watch_masks[8];
-        unsigned int num_valid;
-} __attribute__((aligned(8)));
-struct pt_watch_regs {
-        enum pt_watch_style style;
-        union {
-                struct mips32_watch_regs mips32;
-                struct mips64_watch_regs mips64;
-        };
-};
-#define PTRACE_GET_WATCH_REGS   0xd0
-#define PTRACE_SET_WATCH_REGS   0xd1
-#ifdef __KERNEL__
 #include <linux/compiler.h>
 #include <linux/linkage.h>
 #include <linux/types.h>
 #include <asm/isadep.h>
+#include <uapi/asm/ptrace.h>
 struct task_struct;
@@ -164,6 +61,4 @@ static inline void die_if_kernel(const char *str, struct pt_regs *regs)
                die(str, regs);
 }
-#endif
 #endif /* _ASM_PTRACE_H */
diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h
index 2560b6b6a7d..e26589ef36e 100644
--- a/arch/mips/include/asm/setup.h
+++ b/arch/mips/include/asm/setup.h
@@ -1,9 +1,8 @@
 #ifndef _MIPS_SETUP_H
 #define _MIPS_SETUP_H
-#define COMMAND_LINE_SIZE       4096
+#include <uapi/asm/setup.h>
-#ifdef  __KERNEL__
 extern void setup_early_printk(void);
 extern void set_handler(unsigned long offset, void *addr, unsigned long len);
@@ -17,6 +16,4 @@ extern unsigned long ebase;
 extern void per_cpu_trap_init(bool);
 extern void cpu_cache_init(void);
-#endif /* __KERNEL__ */
 #endif /* __SETUP_H */
diff --git a/arch/mips/include/asm/sigcontext.h b/arch/mips/include/asm/sigcontext.h
index 9e89cf99d4e..eeeb0f48c76 100644
--- a/arch/mips/include/asm/sigcontext.h
+++ b/arch/mips/include/asm/sigcontext.h
@@ -9,71 +9,10 @@
 #ifndef _ASM_SIGCONTEXT_H
 #define _ASM_SIGCONTEXT_H
-#include <linux/types.h>
+#include <uapi/asm/sigcontext.h>
-#include <asm/sgidefs.h>
-#if _MIPS_SIM == _MIPS_SIM_ABI32
-/*
- * Keep this struct definition in sync with the sigcontext fragment
- * in arch/mips/tools/offset.c
- */
-struct sigcontext {
-        unsigned int            sc_regmask;     /* Unused */
-        unsigned int            sc_status;      /* Unused */
-        unsigned long long      sc_pc;
-        unsigned long long      sc_regs[32];
-        unsigned long long      sc_fpregs[32];
-        unsigned int            sc_acx;         /* Was sc_ownedfp */
-        unsigned int            sc_fpc_csr;
-        unsigned int            sc_fpc_eir;     /* Unused */
-        unsigned int            sc_used_math;
-        unsigned int            sc_dsp;         /* dsp status, was sc_ssflags */
-        unsigned long long      sc_mdhi;
-        unsigned long long      sc_mdlo;
-        unsigned long           sc_hi1;         /* Was sc_cause */
-        unsigned long           sc_lo1;         /* Was sc_badvaddr */
-        unsigned long           sc_hi2;         /* Was sc_sigset[4] */
-        unsigned long           sc_lo2;
-        unsigned long           sc_hi3;
-        unsigned long           sc_lo3;
-};
-#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
-#include <linux/posix_types.h>
-/*
- * Keep this struct definition in sync with the sigcontext fragment
- * in arch/mips/tools/offset.c
- *
- * Warning: this structure illdefined with sc_badvaddr being just an unsigned
- * int so it was changed to unsigned long in 2.6.0-test1.  This may break
- * binary compatibility - no prisoners.
- * DSP ASE in 2.6.12-rc4.  Turn sc_mdhi and sc_mdlo into an array of four
- * entries, add sc_dsp and sc_reserved for padding.  No prisoners.
- */
-struct sigcontext {
-        __u64   sc_regs[32];
-        __u64   sc_fpregs[32];
-        __u64   sc_mdhi;
-        __u64   sc_hi1;
-        __u64   sc_hi2;
-        __u64   sc_hi3;
-        __u64   sc_mdlo;
-        __u64   sc_lo1;
-        __u64   sc_lo2;
-        __u64   sc_lo3;
-        __u64   sc_pc;
-        __u32   sc_fpc_csr;
-        __u32   sc_used_math;
-        __u32   sc_dsp;
-        __u32   sc_reserved;
-};
-#ifdef __KERNEL__
 struct sigcontext32 {
        __u32           sc_regmask;     /* Unused */
        __u32           sc_status;      /* Unused */
@@ -94,8 +33,5 @@ struct sigcontext32 {
        __u32           sc_hi3;
        __u32           sc_lo3;
 };
-#endif /* __KERNEL__ */
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
 #endif /* _ASM_SIGCONTEXT_H */
diff --git a/arch/mips/include/asm/siginfo.h b/arch/mips/include/asm/siginfo.h
index 20ebeb875ee..dd9a762646f 100644
--- a/arch/mips/include/asm/siginfo.h
+++ b/arch/mips/include/asm/siginfo.h
@@ -9,108 +9,8 @@
 #ifndef _ASM_SIGINFO_H
 #define _ASM_SIGINFO_H
+#include <uapi/asm/siginfo.h>
-#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
-#undef __ARCH_SI_TRAPNO /* exception code needs to fill this ...  */
-#define HAVE_ARCH_SIGINFO_T
-/*
- * We duplicate the generic versions - <asm-generic/siginfo.h> is just borked
- * by design ...
- */
-#define HAVE_ARCH_COPY_SIGINFO
-struct siginfo;
-/*
- * Careful to keep union _sifields from shifting ...
- */
-#ifdef CONFIG_32BIT
-#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
-#endif
-#ifdef CONFIG_64BIT
-#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
-#endif
-#include <asm-generic/siginfo.h>
-typedef struct siginfo {
-        int si_signo;
-        int si_code;
-        int si_errno;
-        int __pad0[SI_MAX_SIZE / sizeof(int) - SI_PAD_SIZE - 3];
-        union {
-                int _pad[SI_PAD_SIZE];
-                /* kill() */
-                struct {
-                        pid_t _pid;             /* sender's pid */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                } _kill;
-                /* POSIX.1b timers */
-                struct {
-                        timer_t _tid;           /* timer id */
-                        int _overrun;           /* overrun count */
-                        char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
-                        sigval_t _sigval;       /* same as below */
-                        int _sys_private;       /* not to be passed to user */
-                } _timer;
-                /* POSIX.1b signals */
-                struct {
-                        pid_t _pid;             /* sender's pid */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                        sigval_t _sigval;
-                } _rt;
-                /* SIGCHLD */
-                struct {
-                        pid_t _pid;             /* which child */
-                        __ARCH_SI_UID_T _uid;   /* sender's uid */
-                        int _status;            /* exit code */
-                        clock_t _utime;
-                        clock_t _stime;
-                } _sigchld;
-                /* IRIX SIGCHLD */
-                struct {
-                        pid_t _pid;             /* which child */
-                        clock_t _utime;
-                        int _status;            /* exit code */
-                        clock_t _stime;
-                } _irix_sigchld;
-                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
-                struct {
-                        void __user *_addr; /* faulting insn/memory ref. */
-#ifdef __ARCH_SI_TRAPNO
-                        int _trapno;    /* TRAP # which caused the signal */
-#endif
-                        short _addr_lsb;
-                } _sigfault;
-                /* SIGPOLL, SIGXFSZ (To do ...)  */
-                struct {
-                        __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
-                        int _fd;
-                } _sigpoll;
-        } _sifields;
-} siginfo_t;
-/*
- * si_code values
- * Again these have been chosen to be IRIX compatible.
- */
-#undef SI_ASYNCIO
-#undef SI_TIMER
-#undef SI_MESGQ
-#define SI_ASYNCIO      -2      /* sent by AIO completion */
-#define SI_TIMER __SI_CODE(__SI_TIMER, -3) /* sent by timer expiration */
-#define SI_MESGQ __SI_CODE(__SI_MESGQ, -4) /* sent by real time mesq state change */
-#ifdef __KERNEL__
 /*
 * Duplicated here because of <asm-generic/siginfo.h> braindamage ...
@@ -126,6 +26,4 @@ static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
                memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld));
 }
-#endif
 #endif /* _ASM_SIGINFO_H */
diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h
index c783f364938..880240dff8b 100644
--- a/arch/mips/include/asm/signal.h
+++ b/arch/mips/include/asm/signal.h
@@ -9,93 +9,8 @@
 #ifndef _ASM_SIGNAL_H
 #define _ASM_SIGNAL_H
-#include <linux/types.h>
+#include <uapi/asm/signal.h>
-#define _NSIG           128
-#define _NSIG_BPW       (sizeof(unsigned long) * 8)
-#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
-typedef struct {
-        unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-typedef unsigned long old_sigset_t;             /* at least 32 bits */
-#define SIGHUP           1      /* Hangup (POSIX).  */
-#define SIGINT           2      /* Interrupt (ANSI).  */
-#define SIGQUIT          3      /* Quit (POSIX).  */
-#define SIGILL           4      /* Illegal instruction (ANSI).  */
-#define SIGTRAP          5      /* Trace trap (POSIX).  */
-#define SIGIOT           6      /* IOT trap (4.2 BSD).  */
-#define SIGABRT          SIGIOT /* Abort (ANSI).  */
-#define SIGEMT           7
-#define SIGFPE           8      /* Floating-point exception (ANSI).  */
-#define SIGKILL          9      /* Kill, unblockable (POSIX).  */
-#define SIGBUS          10      /* BUS error (4.2 BSD).  */
-#define SIGSEGV         11      /* Segmentation violation (ANSI).  */
-#define SIGSYS          12
-#define SIGPIPE         13      /* Broken pipe (POSIX).  */
-#define SIGALRM         14      /* Alarm clock (POSIX).  */
-#define SIGTERM         15      /* Termination (ANSI).  */
-#define SIGUSR1         16      /* User-defined signal 1 (POSIX).  */
-#define SIGUSR2         17      /* User-defined signal 2 (POSIX).  */
-#define SIGCHLD         18      /* Child status has changed (POSIX).  */
-#define SIGCLD          SIGCHLD /* Same as SIGCHLD (System V).  */
-#define SIGPWR          19      /* Power failure restart (System V).  */
-#define SIGWINCH        20      /* Window size change (4.3 BSD, Sun).  */
-#define SIGURG          21      /* Urgent condition on socket (4.2 BSD).  */
-#define SIGIO           22      /* I/O now possible (4.2 BSD).  */
-#define SIGPOLL         SIGIO   /* Pollable event occurred (System V).  */
-#define SIGSTOP         23      /* Stop, unblockable (POSIX).  */
-#define SIGTSTP         24      /* Keyboard stop (POSIX).  */
-#define SIGCONT         25      /* Continue (POSIX).  */
-#define SIGTTIN         26      /* Background read from tty (POSIX).  */
-#define SIGTTOU         27      /* Background write to tty (POSIX).  */
-#define SIGVTALRM       28      /* Virtual alarm clock (4.2 BSD).  */
-#define SIGPROF         29      /* Profiling alarm clock (4.2 BSD).  */
-#define SIGXCPU         30      /* CPU limit exceeded (4.2 BSD).  */
-#define SIGXFSZ         31      /* File size limit exceeded (4.2 BSD).  */
-/* These should not be considered constants from userland.  */
-#define SIGRTMIN        32
-#define SIGRTMAX        _NSIG
-/*
- * SA_FLAGS values:
- *
- * SA_ONSTACK indicates that a registered stack_t will be used.
- * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
- * SA_RESETHAND clears the handler when the signal is delivered.
- * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
- * SA_NODEFER prevents the current signal from being masked in the handler.
- *
- * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
- * Unix names RESETHAND and NODEFER respectively.
- */
-#define SA_ONSTACK      0x08000000
-#define SA_RESETHAND    0x80000000
-#define SA_RESTART      0x10000000
-#define SA_SIGINFO      0x00000008
-#define SA_NODEFER      0x40000000
-#define SA_NOCLDWAIT    0x00010000
-#define SA_NOCLDSTOP    0x00000001
-#define SA_NOMASK       SA_NODEFER
-#define SA_ONESHOT      SA_RESETHAND
-#define SA_RESTORER     0x04000000      /* Only for o32 */
-/*
- * sigaltstack controls
- */
-#define SS_ONSTACK     1
-#define SS_DISABLE     2
-#define MINSIGSTKSZ    2048
-#define SIGSTKSZ       8192
-#ifdef __KERNEL__
 #ifdef CONFIG_TRAD_SIGNALS
 #define sig_uses_siginfo(ka)    ((ka)->sa.sa_flags & SA_SIGINFO)
@@ -103,37 +18,9 @@ typedef unsigned long old_sigset_t;		/* at least 32 bits */
 #define sig_uses_siginfo(ka)    (1)
 #endif
-#endif /* __KERNEL__ */
-#define SIG_BLOCK       1       /* for blocking signals */
-#define SIG_UNBLOCK     2       /* for unblocking signals */
-#define SIG_SETMASK     3       /* for setting the signal mask */
-#include <asm-generic/signal-defs.h>
-struct sigaction {
-        unsigned int    sa_flags;
-        __sighandler_t  sa_handler;
-        sigset_t        sa_mask;
-};
-struct k_sigaction {
-        struct sigaction sa;
-};
-/* IRIX compatible stack_t  */
-typedef struct sigaltstack {
-        void __user *ss_sp;
-        size_t ss_size;
-        int ss_flags;
-} stack_t;
-#ifdef __KERNEL__
 #include <asm/sigcontext.h>
 #include <asm/siginfo.h>
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
-#endif /* __KERNEL__ */
 #endif /* _ASM_SIGNAL_H */
diff --git a/arch/mips/include/asm/socket.h b/arch/mips/include/asm/socket.h
index a2ed6fdad4e..4724a563c5b 100644
--- a/arch/mips/include/asm/socket.h
+++ b/arch/mips/include/asm/socket.h
@@ -9,87 +9,8 @@
 #ifndef _ASM_SOCKET_H
 #define _ASM_SOCKET_H
-#include <asm/sockios.h>
+#include <uapi/asm/socket.h>
-/*
- * For setsockopt(2)
- *
- * This defines are ABI conformant as far as Linux supports these ...
- */
-#define SOL_SOCKET      0xffff
-#define SO_DEBUG        0x0001  /* Record debugging information.  */
-#define SO_REUSEADDR    0x0004  /* Allow reuse of local addresses.  */
-#define SO_KEEPALIVE    0x0008  /* Keep connections alive and send
-                                   SIGPIPE when they die.  */
-#define SO_DONTROUTE    0x0010  /* Don't do local routing.  */
-#define SO_BROADCAST    0x0020  /* Allow transmission of
-                                   broadcast messages.  */
-#define SO_LINGER       0x0080  /* Block on close of a reliable
-                                   socket to transmit pending data.  */
-#define SO_OOBINLINE 0x0100     /* Receive out-of-band data in-band.  */
-#if 0
-To add: #define SO_REUSEPORT 0x0200     /* Allow local address and port reuse.  */
-#endif
-#define SO_TYPE         0x1008  /* Compatible name for SO_STYLE.  */
-#define SO_STYLE        SO_TYPE /* Synonym */
-#define SO_ERROR        0x1007  /* get error status and clear */
-#define SO_SNDBUF       0x1001  /* Send buffer size. */
-#define SO_RCVBUF       0x1002  /* Receive buffer. */
-#define SO_SNDLOWAT     0x1003  /* send low-water mark */
-#define SO_RCVLOWAT     0x1004  /* receive low-water mark */
-#define SO_SNDTIMEO     0x1005  /* send timeout */
-#define SO_RCVTIMEO     0x1006  /* receive timeout */
-#define SO_ACCEPTCONN   0x1009
-#define SO_PROTOCOL     0x1028  /* protocol type */
-#define SO_DOMAIN       0x1029  /* domain/socket family */
-/* linux-specific, might as well be the same as on i386 */
-#define SO_NO_CHECK     11
-#define SO_PRIORITY     12
-#define SO_BSDCOMPAT    14
-#define SO_PASSCRED     17
-#define SO_PEERCRED     18
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION              22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
-#define SO_SECURITY_ENCRYPTION_NETWORK          24
-#define SO_BINDTODEVICE         25
-/* Socket filtering */
-#define SO_ATTACH_FILTER        26
-#define SO_DETACH_FILTER        27
-#define SO_PEERNAME             28
-#define SO_TIMESTAMP            29
-#define SCM_TIMESTAMP           SO_TIMESTAMP
-#define SO_PEERSEC              30
-#define SO_SNDBUFFORCE          31
-#define SO_RCVBUFFORCE          33
-#define SO_PASSSEC              34
-#define SO_TIMESTAMPNS          35
-#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
-#define SO_MARK                 36
-#define SO_TIMESTAMPING         37
-#define SCM_TIMESTAMPING        SO_TIMESTAMPING
-#define SO_RXQ_OVFL             40
-#define SO_WIFI_STATUS          41
-#define SCM_WIFI_STATUS         SO_WIFI_STATUS
-#define SO_PEEK_OFF             42
-/* Instruct lower device to use last 4-bytes of skb data as FCS */
-#define SO_NOFCS                43
-#ifdef __KERNEL__
 /** sock_type - Socket types
 *
@@ -126,6 +47,4 @@ enum sock_type {
 #define ARCH_HAS_SOCKET_TYPES 1
-#endif /* __KERNEL__ */
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/mips/include/asm/termios.h b/arch/mips/include/asm/termios.h
index abdd87aaf60..6245b68a69a 100644
--- a/arch/mips/include/asm/termios.h
+++ b/arch/mips/include/asm/termios.h
@@ -9,58 +9,8 @@
 #ifndef _ASM_TERMIOS_H
 #define _ASM_TERMIOS_H
-#include <linux/errno.h>
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-struct sgttyb {
-        char    sg_ispeed;
-        char    sg_ospeed;
-        char    sg_erase;
-        char    sg_kill;
-        int     sg_flags;       /* SGI special - int, not short */
-};
-struct tchars {
-        char    t_intrc;
-        char    t_quitc;
-        char    t_startc;
-        char    t_stopc;
-        char    t_eofc;
-        char    t_brkc;
-};
-struct ltchars {
-        char    t_suspc;        /* stop process signal */
-        char    t_dsuspc;       /* delayed stop process signal */
-        char    t_rprntc;       /* reprint line */
-        char    t_flushc;       /* flush output (toggles) */
-        char    t_werasc;       /* word erase */
-        char    t_lnextc;       /* literal next character */
-};
-/* TIOCGSIZE, TIOCSSIZE not defined yet.  Only needed for SunOS source
-   compatibility anyway ... */
-struct winsize {
-        unsigned short ws_row;
-        unsigned short ws_col;
-        unsigned short ws_xpixel;
-        unsigned short ws_ypixel;
-};
-#define NCC     8
-struct termio {
-        unsigned short c_iflag;         /* input mode flags */
-        unsigned short c_oflag;         /* output mode flags */
-        unsigned short c_cflag;         /* control mode flags */
-        unsigned short c_lflag;         /* local mode flags */
-        char c_line;                    /* line discipline */
-        unsigned char c_cc[NCCS];       /* control characters */
-};
-#ifdef __KERNEL__
 #include <asm/uaccess.h>
+#include <uapi/asm/termios.h>
 /*
 *      intr=^C         quit=^\         erase=del       kill=^U
@@ -70,25 +20,6 @@ struct termio {
 *      eof=^D          eol=\0
 */
 #define INIT_C_CC "\003\034\177\025\1\0\0\0\021\023\032\0\022\017\027\026\004\0"
-#endif
-/* modem lines */
-#define TIOCM_LE        0x001           /* line enable */
-#define TIOCM_DTR       0x002           /* data terminal ready */
-#define TIOCM_RTS       0x004           /* request to send */
-#define TIOCM_ST        0x010           /* secondary transmit */
-#define TIOCM_SR        0x020           /* secondary receive */
-#define TIOCM_CTS       0x040           /* clear to send */
-#define TIOCM_CAR       0x100           /* carrier detect */
-#define TIOCM_CD        TIOCM_CAR
-#define TIOCM_RNG       0x200           /* ring */
-#define TIOCM_RI        TIOCM_RNG
-#define TIOCM_DSR       0x400           /* data set ready */
-#define TIOCM_OUT1      0x2000
-#define TIOCM_OUT2      0x4000
-#define TIOCM_LOOP      0x8000
-#ifdef __KERNEL__
 #include <linux/string.h>
@@ -171,6 +102,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
        return copy_to_user(u, k, sizeof(struct termios)) ? -EFAULT : 0;
 }
-#endif /* defined(__KERNEL__) */
 #endif /* _ASM_TERMIOS_H */
diff --git a/arch/mips/include/asm/types.h b/arch/mips/include/asm/types.h
index 1228b25b290..a845aafedee 100644
--- a/arch/mips/include/asm/types.h
+++ b/arch/mips/include/asm/types.h
@@ -11,24 +11,12 @@
 #ifndef _ASM_TYPES_H
 #define _ASM_TYPES_H
-/*
- * We don't use int-l64.h for the kernel anymore but still use it for
- * userspace to avoid code changes.
- */
-#ifdef __KERNEL__
 # include <asm-generic/int-ll64.h>
-#else
+#include <uapi/asm/types.h>
-# if _MIPS_SZLONG == 64
-#  include <asm-generic/int-l64.h>
-# else
-#  include <asm-generic/int-ll64.h>
-# endif
-#endif
 /*
 * These aren't exported outside the kernel to avoid name space clashes
 */
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 /*
@@ -42,6 +30,4 @@ typedef unsigned long phys_t;
 #endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
 #endif /* _ASM_TYPES_H */
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index 161fc4d976e..9e47cc11aa2 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -12,1027 +12,8 @@
 #ifndef _ASM_UNISTD_H
 #define _ASM_UNISTD_H
-#include <asm/sgidefs.h>
+#include <uapi/asm/unistd.h>
-#if _MIPS_SIM == _MIPS_SIM_ABI32
-/*
- * Linux o32 style syscalls are in the range from 4000 to 4999.
- */
-#define __NR_Linux                      4000
-#define __NR_syscall                    (__NR_Linux +   0)
-#define __NR_exit                       (__NR_Linux +   1)
-#define __NR_fork                       (__NR_Linux +   2)
-#define __NR_read                       (__NR_Linux +   3)
-#define __NR_write                      (__NR_Linux +   4)
-#define __NR_open                       (__NR_Linux +   5)
-#define __NR_close                      (__NR_Linux +   6)
-#define __NR_waitpid                    (__NR_Linux +   7)
-#define __NR_creat                      (__NR_Linux +   8)
-#define __NR_link                       (__NR_Linux +   9)
-#define __NR_unlink                     (__NR_Linux +  10)
-#define __NR_execve                     (__NR_Linux +  11)
-#define __NR_chdir                      (__NR_Linux +  12)
-#define __NR_time                       (__NR_Linux +  13)
-#define __NR_mknod                      (__NR_Linux +  14)
-#define __NR_chmod                      (__NR_Linux +  15)
-#define __NR_lchown                     (__NR_Linux +  16)
-#define __NR_break                      (__NR_Linux +  17)
-#define __NR_unused18                   (__NR_Linux +  18)
-#define __NR_lseek                      (__NR_Linux +  19)
-#define __NR_getpid                     (__NR_Linux +  20)
-#define __NR_mount                      (__NR_Linux +  21)
-#define __NR_umount                     (__NR_Linux +  22)
-#define __NR_setuid                     (__NR_Linux +  23)
-#define __NR_getuid                     (__NR_Linux +  24)
-#define __NR_stime                      (__NR_Linux +  25)
-#define __NR_ptrace                     (__NR_Linux +  26)
-#define __NR_alarm                      (__NR_Linux +  27)
-#define __NR_unused28                   (__NR_Linux +  28)
-#define __NR_pause                      (__NR_Linux +  29)
-#define __NR_utime                      (__NR_Linux +  30)
-#define __NR_stty                       (__NR_Linux +  31)
-#define __NR_gtty                       (__NR_Linux +  32)
-#define __NR_access                     (__NR_Linux +  33)
-#define __NR_nice                       (__NR_Linux +  34)
-#define __NR_ftime                      (__NR_Linux +  35)
-#define __NR_sync                       (__NR_Linux +  36)
-#define __NR_kill                       (__NR_Linux +  37)
-#define __NR_rename                     (__NR_Linux +  38)
-#define __NR_mkdir                      (__NR_Linux +  39)
-#define __NR_rmdir                      (__NR_Linux +  40)
-#define __NR_dup                        (__NR_Linux +  41)
-#define __NR_pipe                       (__NR_Linux +  42)
-#define __NR_times                      (__NR_Linux +  43)
-#define __NR_prof                       (__NR_Linux +  44)
-#define __NR_brk                        (__NR_Linux +  45)
-#define __NR_setgid                     (__NR_Linux +  46)
-#define __NR_getgid                     (__NR_Linux +  47)
-#define __NR_signal                     (__NR_Linux +  48)
-#define __NR_geteuid                    (__NR_Linux +  49)
-#define __NR_getegid                    (__NR_Linux +  50)
-#define __NR_acct                       (__NR_Linux +  51)
-#define __NR_umount2                    (__NR_Linux +  52)
-#define __NR_lock                       (__NR_Linux +  53)
-#define __NR_ioctl                      (__NR_Linux +  54)
-#define __NR_fcntl                      (__NR_Linux +  55)
-#define __NR_mpx                        (__NR_Linux +  56)
-#define __NR_setpgid                    (__NR_Linux +  57)
-#define __NR_ulimit                     (__NR_Linux +  58)
-#define __NR_unused59                   (__NR_Linux +  59)
-#define __NR_umask                      (__NR_Linux +  60)
-#define __NR_chroot                     (__NR_Linux +  61)
-#define __NR_ustat                      (__NR_Linux +  62)
-#define __NR_dup2                       (__NR_Linux +  63)
-#define __NR_getppid                    (__NR_Linux +  64)
-#define __NR_getpgrp                    (__NR_Linux +  65)
-#define __NR_setsid                     (__NR_Linux +  66)
-#define __NR_sigaction                  (__NR_Linux +  67)
-#define __NR_sgetmask                   (__NR_Linux +  68)
-#define __NR_ssetmask                   (__NR_Linux +  69)
-#define __NR_setreuid                   (__NR_Linux +  70)
-#define __NR_setregid                   (__NR_Linux +  71)
-#define __NR_sigsuspend                 (__NR_Linux +  72)
-#define __NR_sigpending                 (__NR_Linux +  73)
-#define __NR_sethostname                (__NR_Linux +  74)
-#define __NR_setrlimit                  (__NR_Linux +  75)
-#define __NR_getrlimit                  (__NR_Linux +  76)
-#define __NR_getrusage                  (__NR_Linux +  77)
-#define __NR_gettimeofday               (__NR_Linux +  78)
-#define __NR_settimeofday               (__NR_Linux +  79)
-#define __NR_getgroups                  (__NR_Linux +  80)
-#define __NR_setgroups                  (__NR_Linux +  81)
-#define __NR_reserved82                 (__NR_Linux +  82)
-#define __NR_symlink                    (__NR_Linux +  83)
-#define __NR_unused84                   (__NR_Linux +  84)
-#define __NR_readlink                   (__NR_Linux +  85)
-#define __NR_uselib                     (__NR_Linux +  86)
-#define __NR_swapon                     (__NR_Linux +  87)
-#define __NR_reboot                     (__NR_Linux +  88)
-#define __NR_readdir                    (__NR_Linux +  89)
-#define __NR_mmap                       (__NR_Linux +  90)
-#define __NR_munmap                     (__NR_Linux +  91)
-#define __NR_truncate                   (__NR_Linux +  92)
-#define __NR_ftruncate                  (__NR_Linux +  93)
-#define __NR_fchmod                     (__NR_Linux +  94)
-#define __NR_fchown                     (__NR_Linux +  95)
-#define __NR_getpriority                (__NR_Linux +  96)
-#define __NR_setpriority                (__NR_Linux +  97)
-#define __NR_profil                     (__NR_Linux +  98)
-#define __NR_statfs                     (__NR_Linux +  99)
-#define __NR_fstatfs                    (__NR_Linux + 100)
-#define __NR_ioperm                     (__NR_Linux + 101)
-#define __NR_socketcall                 (__NR_Linux + 102)
-#define __NR_syslog                     (__NR_Linux + 103)
-#define __NR_setitimer                  (__NR_Linux + 104)
-#define __NR_getitimer                  (__NR_Linux + 105)
-#define __NR_stat                       (__NR_Linux + 106)
-#define __NR_lstat                      (__NR_Linux + 107)
-#define __NR_fstat                      (__NR_Linux + 108)
-#define __NR_unused109                  (__NR_Linux + 109)
-#define __NR_iopl                       (__NR_Linux + 110)
-#define __NR_vhangup                    (__NR_Linux + 111)
-#define __NR_idle                       (__NR_Linux + 112)
-#define __NR_vm86                       (__NR_Linux + 113)
-#define __NR_wait4                      (__NR_Linux + 114)
-#define __NR_swapoff                    (__NR_Linux + 115)
-#define __NR_sysinfo                    (__NR_Linux + 116)
-#define __NR_ipc                        (__NR_Linux + 117)
-#define __NR_fsync                      (__NR_Linux + 118)
-#define __NR_sigreturn                  (__NR_Linux + 119)
-#define __NR_clone                      (__NR_Linux + 120)
-#define __NR_setdomainname              (__NR_Linux + 121)
-#define __NR_uname                      (__NR_Linux + 122)
-#define __NR_modify_ldt                 (__NR_Linux + 123)
-#define __NR_adjtimex                   (__NR_Linux + 124)
-#define __NR_mprotect                   (__NR_Linux + 125)
-#define __NR_sigprocmask                (__NR_Linux + 126)
-#define __NR_create_module              (__NR_Linux + 127)
-#define __NR_init_module                (__NR_Linux + 128)
-#define __NR_delete_module              (__NR_Linux + 129)
-#define __NR_get_kernel_syms            (__NR_Linux + 130)
-#define __NR_quotactl                   (__NR_Linux + 131)
-#define __NR_getpgid                    (__NR_Linux + 132)
-#define __NR_fchdir                     (__NR_Linux + 133)
-#define __NR_bdflush                    (__NR_Linux + 134)
-#define __NR_sysfs                      (__NR_Linux + 135)
-#define __NR_personality                (__NR_Linux + 136)
-#define __NR_afs_syscall                (__NR_Linux + 137) /* Syscall for Andrew File System */
-#define __NR_setfsuid                   (__NR_Linux + 138)
-#define __NR_setfsgid                   (__NR_Linux + 139)
-#define __NR__llseek                    (__NR_Linux + 140)
-#define __NR_getdents                   (__NR_Linux + 141)
-#define __NR__newselect                 (__NR_Linux + 142)
-#define __NR_flock                      (__NR_Linux + 143)
-#define __NR_msync                      (__NR_Linux + 144)
-#define __NR_readv                      (__NR_Linux + 145)
-#define __NR_writev                     (__NR_Linux + 146)
-#define __NR_cacheflush                 (__NR_Linux + 147)
-#define __NR_cachectl                   (__NR_Linux + 148)
-#define __NR_sysmips                    (__NR_Linux + 149)
-#define __NR_unused150                  (__NR_Linux + 150)
-#define __NR_getsid                     (__NR_Linux + 151)
-#define __NR_fdatasync                  (__NR_Linux + 152)
-#define __NR__sysctl                    (__NR_Linux + 153)
-#define __NR_mlock                      (__NR_Linux + 154)
-#define __NR_munlock                    (__NR_Linux + 155)
-#define __NR_mlockall                   (__NR_Linux + 156)
-#define __NR_munlockall                 (__NR_Linux + 157)
-#define __NR_sched_setparam             (__NR_Linux + 158)
-#define __NR_sched_getparam             (__NR_Linux + 159)
-#define __NR_sched_setscheduler         (__NR_Linux + 160)
-#define __NR_sched_getscheduler         (__NR_Linux + 161)
-#define __NR_sched_yield                (__NR_Linux + 162)
-#define __NR_sched_get_priority_max     (__NR_Linux + 163)
-#define __NR_sched_get_priority_min     (__NR_Linux + 164)
-#define __NR_sched_rr_get_interval      (__NR_Linux + 165)
-#define __NR_nanosleep                  (__NR_Linux + 166)
-#define __NR_mremap                     (__NR_Linux + 167)
-#define __NR_accept                     (__NR_Linux + 168)
-#define __NR_bind                       (__NR_Linux + 169)
-#define __NR_connect                    (__NR_Linux + 170)
-#define __NR_getpeername                (__NR_Linux + 171)
-#define __NR_getsockname                (__NR_Linux + 172)
-#define __NR_getsockopt                 (__NR_Linux + 173)
-#define __NR_listen                     (__NR_Linux + 174)
-#define __NR_recv                       (__NR_Linux + 175)
-#define __NR_recvfrom                   (__NR_Linux + 176)
-#define __NR_recvmsg                    (__NR_Linux + 177)
-#define __NR_send                       (__NR_Linux + 178)
-#define __NR_sendmsg                    (__NR_Linux + 179)
-#define __NR_sendto                     (__NR_Linux + 180)
-#define __NR_setsockopt                 (__NR_Linux + 181)
-#define __NR_shutdown                   (__NR_Linux + 182)
-#define __NR_socket                     (__NR_Linux + 183)
-#define __NR_socketpair                 (__NR_Linux + 184)
-#define __NR_setresuid                  (__NR_Linux + 185)
-#define __NR_getresuid                  (__NR_Linux + 186)
-#define __NR_query_module               (__NR_Linux + 187)
-#define __NR_poll                       (__NR_Linux + 188)
-#define __NR_nfsservctl                 (__NR_Linux + 189)
-#define __NR_setresgid                  (__NR_Linux + 190)
-#define __NR_getresgid                  (__NR_Linux + 191)
-#define __NR_prctl                      (__NR_Linux + 192)
-#define __NR_rt_sigreturn               (__NR_Linux + 193)
-#define __NR_rt_sigaction               (__NR_Linux + 194)
-#define __NR_rt_sigprocmask             (__NR_Linux + 195)
-#define __NR_rt_sigpending              (__NR_Linux + 196)
-#define __NR_rt_sigtimedwait            (__NR_Linux + 197)
-#define __NR_rt_sigqueueinfo            (__NR_Linux + 198)
-#define __NR_rt_sigsuspend              (__NR_Linux + 199)
-#define __NR_pread64                    (__NR_Linux + 200)
-#define __NR_pwrite64                   (__NR_Linux + 201)
-#define __NR_chown                      (__NR_Linux + 202)
-#define __NR_getcwd                     (__NR_Linux + 203)
-#define __NR_capget                     (__NR_Linux + 204)
-#define __NR_capset                     (__NR_Linux + 205)
-#define __NR_sigaltstack                (__NR_Linux + 206)
-#define __NR_sendfile                   (__NR_Linux + 207)
-#define __NR_getpmsg                    (__NR_Linux + 208)
-#define __NR_putpmsg                    (__NR_Linux + 209)
-#define __NR_mmap2                      (__NR_Linux + 210)
-#define __NR_truncate64                 (__NR_Linux + 211)
-#define __NR_ftruncate64                (__NR_Linux + 212)
-#define __NR_stat64                     (__NR_Linux + 213)
-#define __NR_lstat64                    (__NR_Linux + 214)
-#define __NR_fstat64                    (__NR_Linux + 215)
-#define __NR_pivot_root                 (__NR_Linux + 216)
-#define __NR_mincore                    (__NR_Linux + 217)
-#define __NR_madvise                    (__NR_Linux + 218)
-#define __NR_getdents64                 (__NR_Linux + 219)
-#define __NR_fcntl64                    (__NR_Linux + 220)
-#define __NR_reserved221                (__NR_Linux + 221)
-#define __NR_gettid                     (__NR_Linux + 222)
-#define __NR_readahead                  (__NR_Linux + 223)
-#define __NR_setxattr                   (__NR_Linux + 224)
-#define __NR_lsetxattr                  (__NR_Linux + 225)
-#define __NR_fsetxattr                  (__NR_Linux + 226)
-#define __NR_getxattr                   (__NR_Linux + 227)
-#define __NR_lgetxattr                  (__NR_Linux + 228)
-#define __NR_fgetxattr                  (__NR_Linux + 229)
-#define __NR_listxattr                  (__NR_Linux + 230)
-#define __NR_llistxattr                 (__NR_Linux + 231)
-#define __NR_flistxattr                 (__NR_Linux + 232)
-#define __NR_removexattr                (__NR_Linux + 233)
-#define __NR_lremovexattr               (__NR_Linux + 234)
-#define __NR_fremovexattr               (__NR_Linux + 235)
-#define __NR_tkill                      (__NR_Linux + 236)
-#define __NR_sendfile64                 (__NR_Linux + 237)
-#define __NR_futex                      (__NR_Linux + 238)
-#define __NR_sched_setaffinity          (__NR_Linux + 239)
-#define __NR_sched_getaffinity          (__NR_Linux + 240)
-#define __NR_io_setup                   (__NR_Linux + 241)
-#define __NR_io_destroy                 (__NR_Linux + 242)
-#define __NR_io_getevents               (__NR_Linux + 243)
-#define __NR_io_submit                  (__NR_Linux + 244)
-#define __NR_io_cancel                  (__NR_Linux + 245)
-#define __NR_exit_group                 (__NR_Linux + 246)
-#define __NR_lookup_dcookie             (__NR_Linux + 247)
-#define __NR_epoll_create               (__NR_Linux + 248)
-#define __NR_epoll_ctl                  (__NR_Linux + 249)
-#define __NR_epoll_wait                 (__NR_Linux + 250)
-#define __NR_remap_file_pages           (__NR_Linux + 251)
-#define __NR_set_tid_address            (__NR_Linux + 252)
-#define __NR_restart_syscall            (__NR_Linux + 253)
-#define __NR_fadvise64                  (__NR_Linux + 254)
-#define __NR_statfs64                   (__NR_Linux + 255)
-#define __NR_fstatfs64                  (__NR_Linux + 256)
-#define __NR_timer_create               (__NR_Linux + 257)
-#define __NR_timer_settime              (__NR_Linux + 258)
-#define __NR_timer_gettime              (__NR_Linux + 259)
-#define __NR_timer_getoverrun           (__NR_Linux + 260)
-#define __NR_timer_delete               (__NR_Linux + 261)
-#define __NR_clock_settime              (__NR_Linux + 262)
-#define __NR_clock_gettime              (__NR_Linux + 263)
-#define __NR_clock_getres               (__NR_Linux + 264)
-#define __NR_clock_nanosleep            (__NR_Linux + 265)
-#define __NR_tgkill                     (__NR_Linux + 266)
-#define __NR_utimes                     (__NR_Linux + 267)
-#define __NR_mbind                      (__NR_Linux + 268)
-#define __NR_get_mempolicy              (__NR_Linux + 269)
-#define __NR_set_mempolicy              (__NR_Linux + 270)
-#define __NR_mq_open                    (__NR_Linux + 271)
-#define __NR_mq_unlink                  (__NR_Linux + 272)
-#define __NR_mq_timedsend               (__NR_Linux + 273)
-#define __NR_mq_timedreceive            (__NR_Linux + 274)
-#define __NR_mq_notify                  (__NR_Linux + 275)
-#define __NR_mq_getsetattr              (__NR_Linux + 276)
-#define __NR_vserver                    (__NR_Linux + 277)
-#define __NR_waitid                     (__NR_Linux + 278)
-/* #define __NR_sys_setaltroot          (__NR_Linux + 279) */
-#define __NR_add_key                    (__NR_Linux + 280)
-#define __NR_request_key                (__NR_Linux + 281)
-#define __NR_keyctl                     (__NR_Linux + 282)
-#define __NR_set_thread_area            (__NR_Linux + 283)
-#define __NR_inotify_init               (__NR_Linux + 284)
-#define __NR_inotify_add_watch          (__NR_Linux + 285)
-#define __NR_inotify_rm_watch           (__NR_Linux + 286)
-#define __NR_migrate_pages              (__NR_Linux + 287)
-#define __NR_openat                     (__NR_Linux + 288)
-#define __NR_mkdirat                    (__NR_Linux + 289)
-#define __NR_mknodat                    (__NR_Linux + 290)
-#define __NR_fchownat                   (__NR_Linux + 291)
-#define __NR_futimesat                  (__NR_Linux + 292)
-#define __NR_fstatat64                  (__NR_Linux + 293)
-#define __NR_unlinkat                   (__NR_Linux + 294)
-#define __NR_renameat                   (__NR_Linux + 295)
-#define __NR_linkat                     (__NR_Linux + 296)
-#define __NR_symlinkat                  (__NR_Linux + 297)
-#define __NR_readlinkat                 (__NR_Linux + 298)
-#define __NR_fchmodat                   (__NR_Linux + 299)
-#define __NR_faccessat                  (__NR_Linux + 300)
-#define __NR_pselect6                   (__NR_Linux + 301)
-#define __NR_ppoll                      (__NR_Linux + 302)
-#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)
-#define __NR_set_robust_list            (__NR_Linux + 309)
-#define __NR_get_robust_list            (__NR_Linux + 310)
-#define __NR_kexec_load                 (__NR_Linux + 311)
-#define __NR_getcpu                     (__NR_Linux + 312)
-#define __NR_epoll_pwait                (__NR_Linux + 313)
-#define __NR_ioprio_set                 (__NR_Linux + 314)
-#define __NR_ioprio_get                 (__NR_Linux + 315)
-#define __NR_utimensat                  (__NR_Linux + 316)
-#define __NR_signalfd                   (__NR_Linux + 317)
-#define __NR_timerfd                    (__NR_Linux + 318)
-#define __NR_eventfd                    (__NR_Linux + 319)
-#define __NR_fallocate                  (__NR_Linux + 320)
-#define __NR_timerfd_create             (__NR_Linux + 321)
-#define __NR_timerfd_gettime            (__NR_Linux + 322)
-#define __NR_timerfd_settime            (__NR_Linux + 323)
-#define __NR_signalfd4                  (__NR_Linux + 324)
-#define __NR_eventfd2                   (__NR_Linux + 325)
-#define __NR_epoll_create1              (__NR_Linux + 326)
-#define __NR_dup3                       (__NR_Linux + 327)
-#define __NR_pipe2                      (__NR_Linux + 328)
-#define __NR_inotify_init1              (__NR_Linux + 329)
-#define __NR_preadv                     (__NR_Linux + 330)
-#define __NR_pwritev                    (__NR_Linux + 331)
-#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 332)
-#define __NR_perf_event_open            (__NR_Linux + 333)
-#define __NR_accept4                    (__NR_Linux + 334)
-#define __NR_recvmmsg                   (__NR_Linux + 335)
-#define __NR_fanotify_init              (__NR_Linux + 336)
-#define __NR_fanotify_mark              (__NR_Linux + 337)
-#define __NR_prlimit64                  (__NR_Linux + 338)
-#define __NR_name_to_handle_at          (__NR_Linux + 339)
-#define __NR_open_by_handle_at          (__NR_Linux + 340)
-#define __NR_clock_adjtime              (__NR_Linux + 341)
-#define __NR_syncfs                     (__NR_Linux + 342)
-#define __NR_sendmmsg                   (__NR_Linux + 343)
-#define __NR_setns                      (__NR_Linux + 344)
-#define __NR_process_vm_readv           (__NR_Linux + 345)
-#define __NR_process_vm_writev          (__NR_Linux + 346)
-#define __NR_kcmp                       (__NR_Linux + 347)
-/*
- * Offset of the last Linux o32 flavoured syscall
- */
-#define __NR_Linux_syscalls             347
-#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
-#define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         347
-#if _MIPS_SIM == _MIPS_SIM_ABI64
-/*
- * Linux 64-bit syscalls are in the range from 5000 to 5999.
- */
-#define __NR_Linux                      5000
-#define __NR_read                       (__NR_Linux +   0)
-#define __NR_write                      (__NR_Linux +   1)
-#define __NR_open                       (__NR_Linux +   2)
-#define __NR_close                      (__NR_Linux +   3)
-#define __NR_stat                       (__NR_Linux +   4)
-#define __NR_fstat                      (__NR_Linux +   5)
-#define __NR_lstat                      (__NR_Linux +   6)
-#define __NR_poll                       (__NR_Linux +   7)
-#define __NR_lseek                      (__NR_Linux +   8)
-#define __NR_mmap                       (__NR_Linux +   9)
-#define __NR_mprotect                   (__NR_Linux +  10)
-#define __NR_munmap                     (__NR_Linux +  11)
-#define __NR_brk                        (__NR_Linux +  12)
-#define __NR_rt_sigaction               (__NR_Linux +  13)
-#define __NR_rt_sigprocmask             (__NR_Linux +  14)
-#define __NR_ioctl                      (__NR_Linux +  15)
-#define __NR_pread64                    (__NR_Linux +  16)
-#define __NR_pwrite64                   (__NR_Linux +  17)
-#define __NR_readv                      (__NR_Linux +  18)
-#define __NR_writev                     (__NR_Linux +  19)
-#define __NR_access                     (__NR_Linux +  20)
-#define __NR_pipe                       (__NR_Linux +  21)
-#define __NR__newselect                 (__NR_Linux +  22)
-#define __NR_sched_yield                (__NR_Linux +  23)
-#define __NR_mremap                     (__NR_Linux +  24)
-#define __NR_msync                      (__NR_Linux +  25)
-#define __NR_mincore                    (__NR_Linux +  26)
-#define __NR_madvise                    (__NR_Linux +  27)
-#define __NR_shmget                     (__NR_Linux +  28)
-#define __NR_shmat                      (__NR_Linux +  29)
-#define __NR_shmctl                     (__NR_Linux +  30)
-#define __NR_dup                        (__NR_Linux +  31)
-#define __NR_dup2                       (__NR_Linux +  32)
-#define __NR_pause                      (__NR_Linux +  33)
-#define __NR_nanosleep                  (__NR_Linux +  34)
-#define __NR_getitimer                  (__NR_Linux +  35)
-#define __NR_setitimer                  (__NR_Linux +  36)
-#define __NR_alarm                      (__NR_Linux +  37)
-#define __NR_getpid                     (__NR_Linux +  38)
-#define __NR_sendfile                   (__NR_Linux +  39)
-#define __NR_socket                     (__NR_Linux +  40)
-#define __NR_connect                    (__NR_Linux +  41)
-#define __NR_accept                     (__NR_Linux +  42)
-#define __NR_sendto                     (__NR_Linux +  43)
-#define __NR_recvfrom                   (__NR_Linux +  44)
-#define __NR_sendmsg                    (__NR_Linux +  45)
-#define __NR_recvmsg                    (__NR_Linux +  46)
-#define __NR_shutdown                   (__NR_Linux +  47)
-#define __NR_bind                       (__NR_Linux +  48)
-#define __NR_listen                     (__NR_Linux +  49)
-#define __NR_getsockname                (__NR_Linux +  50)
-#define __NR_getpeername                (__NR_Linux +  51)
-#define __NR_socketpair                 (__NR_Linux +  52)
-#define __NR_setsockopt                 (__NR_Linux +  53)
-#define __NR_getsockopt                 (__NR_Linux +  54)
-#define __NR_clone                      (__NR_Linux +  55)
-#define __NR_fork                       (__NR_Linux +  56)
-#define __NR_execve                     (__NR_Linux +  57)
-#define __NR_exit                       (__NR_Linux +  58)
-#define __NR_wait4                      (__NR_Linux +  59)
-#define __NR_kill                       (__NR_Linux +  60)
-#define __NR_uname                      (__NR_Linux +  61)
-#define __NR_semget                     (__NR_Linux +  62)
-#define __NR_semop                      (__NR_Linux +  63)
-#define __NR_semctl                     (__NR_Linux +  64)
-#define __NR_shmdt                      (__NR_Linux +  65)
-#define __NR_msgget                     (__NR_Linux +  66)
-#define __NR_msgsnd                     (__NR_Linux +  67)
-#define __NR_msgrcv                     (__NR_Linux +  68)
-#define __NR_msgctl                     (__NR_Linux +  69)
-#define __NR_fcntl                      (__NR_Linux +  70)
-#define __NR_flock                      (__NR_Linux +  71)
-#define __NR_fsync                      (__NR_Linux +  72)
-#define __NR_fdatasync                  (__NR_Linux +  73)
-#define __NR_truncate                   (__NR_Linux +  74)
-#define __NR_ftruncate                  (__NR_Linux +  75)
-#define __NR_getdents                   (__NR_Linux +  76)
-#define __NR_getcwd                     (__NR_Linux +  77)
-#define __NR_chdir                      (__NR_Linux +  78)
-#define __NR_fchdir                     (__NR_Linux +  79)
-#define __NR_rename                     (__NR_Linux +  80)
-#define __NR_mkdir                      (__NR_Linux +  81)
-#define __NR_rmdir                      (__NR_Linux +  82)
-#define __NR_creat                      (__NR_Linux +  83)
-#define __NR_link                       (__NR_Linux +  84)
-#define __NR_unlink                     (__NR_Linux +  85)
-#define __NR_symlink                    (__NR_Linux +  86)
-#define __NR_readlink                   (__NR_Linux +  87)
-#define __NR_chmod                      (__NR_Linux +  88)
-#define __NR_fchmod                     (__NR_Linux +  89)
-#define __NR_chown                      (__NR_Linux +  90)
-#define __NR_fchown                     (__NR_Linux +  91)
-#define __NR_lchown                     (__NR_Linux +  92)
-#define __NR_umask                      (__NR_Linux +  93)
-#define __NR_gettimeofday               (__NR_Linux +  94)
-#define __NR_getrlimit                  (__NR_Linux +  95)
-#define __NR_getrusage                  (__NR_Linux +  96)
-#define __NR_sysinfo                    (__NR_Linux +  97)
-#define __NR_times                      (__NR_Linux +  98)
-#define __NR_ptrace                     (__NR_Linux +  99)
-#define __NR_getuid                     (__NR_Linux + 100)
-#define __NR_syslog                     (__NR_Linux + 101)
-#define __NR_getgid                     (__NR_Linux + 102)
-#define __NR_setuid                     (__NR_Linux + 103)
-#define __NR_setgid                     (__NR_Linux + 104)
-#define __NR_geteuid                    (__NR_Linux + 105)
-#define __NR_getegid                    (__NR_Linux + 106)
-#define __NR_setpgid                    (__NR_Linux + 107)
-#define __NR_getppid                    (__NR_Linux + 108)
-#define __NR_getpgrp                    (__NR_Linux + 109)
-#define __NR_setsid                     (__NR_Linux + 110)
-#define __NR_setreuid                   (__NR_Linux + 111)
-#define __NR_setregid                   (__NR_Linux + 112)
-#define __NR_getgroups                  (__NR_Linux + 113)
-#define __NR_setgroups                  (__NR_Linux + 114)
-#define __NR_setresuid                  (__NR_Linux + 115)
-#define __NR_getresuid                  (__NR_Linux + 116)
-#define __NR_setresgid                  (__NR_Linux + 117)
-#define __NR_getresgid                  (__NR_Linux + 118)
-#define __NR_getpgid                    (__NR_Linux + 119)
-#define __NR_setfsuid                   (__NR_Linux + 120)
-#define __NR_setfsgid                   (__NR_Linux + 121)
-#define __NR_getsid                     (__NR_Linux + 122)
-#define __NR_capget                     (__NR_Linux + 123)
-#define __NR_capset                     (__NR_Linux + 124)
-#define __NR_rt_sigpending              (__NR_Linux + 125)
-#define __NR_rt_sigtimedwait            (__NR_Linux + 126)
-#define __NR_rt_sigqueueinfo            (__NR_Linux + 127)
-#define __NR_rt_sigsuspend              (__NR_Linux + 128)
-#define __NR_sigaltstack                (__NR_Linux + 129)
-#define __NR_utime                      (__NR_Linux + 130)
-#define __NR_mknod                      (__NR_Linux + 131)
-#define __NR_personality                (__NR_Linux + 132)
-#define __NR_ustat                      (__NR_Linux + 133)
-#define __NR_statfs                     (__NR_Linux + 134)
-#define __NR_fstatfs                    (__NR_Linux + 135)
-#define __NR_sysfs                      (__NR_Linux + 136)
-#define __NR_getpriority                (__NR_Linux + 137)
-#define __NR_setpriority                (__NR_Linux + 138)
-#define __NR_sched_setparam             (__NR_Linux + 139)
-#define __NR_sched_getparam             (__NR_Linux + 140)
-#define __NR_sched_setscheduler         (__NR_Linux + 141)
-#define __NR_sched_getscheduler         (__NR_Linux + 142)
-#define __NR_sched_get_priority_max     (__NR_Linux + 143)
-#define __NR_sched_get_priority_min     (__NR_Linux + 144)
-#define __NR_sched_rr_get_interval      (__NR_Linux + 145)
-#define __NR_mlock                      (__NR_Linux + 146)
-#define __NR_munlock                    (__NR_Linux + 147)
-#define __NR_mlockall                   (__NR_Linux + 148)
-#define __NR_munlockall                 (__NR_Linux + 149)
-#define __NR_vhangup                    (__NR_Linux + 150)
-#define __NR_pivot_root                 (__NR_Linux + 151)
-#define __NR__sysctl                    (__NR_Linux + 152)
-#define __NR_prctl                      (__NR_Linux + 153)
-#define __NR_adjtimex                   (__NR_Linux + 154)
-#define __NR_setrlimit                  (__NR_Linux + 155)
-#define __NR_chroot                     (__NR_Linux + 156)
-#define __NR_sync                       (__NR_Linux + 157)
-#define __NR_acct                       (__NR_Linux + 158)
-#define __NR_settimeofday               (__NR_Linux + 159)
-#define __NR_mount                      (__NR_Linux + 160)
-#define __NR_umount2                    (__NR_Linux + 161)
-#define __NR_swapon                     (__NR_Linux + 162)
-#define __NR_swapoff                    (__NR_Linux + 163)
-#define __NR_reboot                     (__NR_Linux + 164)
-#define __NR_sethostname                (__NR_Linux + 165)
-#define __NR_setdomainname              (__NR_Linux + 166)
-#define __NR_create_module              (__NR_Linux + 167)
-#define __NR_init_module                (__NR_Linux + 168)
-#define __NR_delete_module              (__NR_Linux + 169)
-#define __NR_get_kernel_syms            (__NR_Linux + 170)
-#define __NR_query_module               (__NR_Linux + 171)
-#define __NR_quotactl                   (__NR_Linux + 172)
-#define __NR_nfsservctl                 (__NR_Linux + 173)
-#define __NR_getpmsg                    (__NR_Linux + 174)
-#define __NR_putpmsg                    (__NR_Linux + 175)
-#define __NR_afs_syscall                (__NR_Linux + 176)
-#define __NR_reserved177                (__NR_Linux + 177)
-#define __NR_gettid                     (__NR_Linux + 178)
-#define __NR_readahead                  (__NR_Linux + 179)
-#define __NR_setxattr                   (__NR_Linux + 180)
-#define __NR_lsetxattr                  (__NR_Linux + 181)
-#define __NR_fsetxattr                  (__NR_Linux + 182)
-#define __NR_getxattr                   (__NR_Linux + 183)
-#define __NR_lgetxattr                  (__NR_Linux + 184)
-#define __NR_fgetxattr                  (__NR_Linux + 185)
-#define __NR_listxattr                  (__NR_Linux + 186)
-#define __NR_llistxattr                 (__NR_Linux + 187)
-#define __NR_flistxattr                 (__NR_Linux + 188)
-#define __NR_removexattr                (__NR_Linux + 189)
-#define __NR_lremovexattr               (__NR_Linux + 190)
-#define __NR_fremovexattr               (__NR_Linux + 191)
-#define __NR_tkill                      (__NR_Linux + 192)
-#define __NR_reserved193                (__NR_Linux + 193)
-#define __NR_futex                      (__NR_Linux + 194)
-#define __NR_sched_setaffinity          (__NR_Linux + 195)
-#define __NR_sched_getaffinity          (__NR_Linux + 196)
-#define __NR_cacheflush                 (__NR_Linux + 197)
-#define __NR_cachectl                   (__NR_Linux + 198)
-#define __NR_sysmips                    (__NR_Linux + 199)
-#define __NR_io_setup                   (__NR_Linux + 200)
-#define __NR_io_destroy                 (__NR_Linux + 201)
-#define __NR_io_getevents               (__NR_Linux + 202)
-#define __NR_io_submit                  (__NR_Linux + 203)
-#define __NR_io_cancel                  (__NR_Linux + 204)
-#define __NR_exit_group                 (__NR_Linux + 205)
-#define __NR_lookup_dcookie             (__NR_Linux + 206)
-#define __NR_epoll_create               (__NR_Linux + 207)
-#define __NR_epoll_ctl                  (__NR_Linux + 208)
-#define __NR_epoll_wait                 (__NR_Linux + 209)
-#define __NR_remap_file_pages           (__NR_Linux + 210)
-#define __NR_rt_sigreturn               (__NR_Linux + 211)
-#define __NR_set_tid_address            (__NR_Linux + 212)
-#define __NR_restart_syscall            (__NR_Linux + 213)
-#define __NR_semtimedop                 (__NR_Linux + 214)
-#define __NR_fadvise64                  (__NR_Linux + 215)
-#define __NR_timer_create               (__NR_Linux + 216)
-#define __NR_timer_settime              (__NR_Linux + 217)
-#define __NR_timer_gettime              (__NR_Linux + 218)
-#define __NR_timer_getoverrun           (__NR_Linux + 219)
-#define __NR_timer_delete               (__NR_Linux + 220)
-#define __NR_clock_settime              (__NR_Linux + 221)
-#define __NR_clock_gettime              (__NR_Linux + 222)
-#define __NR_clock_getres               (__NR_Linux + 223)
-#define __NR_clock_nanosleep            (__NR_Linux + 224)
-#define __NR_tgkill                     (__NR_Linux + 225)
-#define __NR_utimes                     (__NR_Linux + 226)
-#define __NR_mbind                      (__NR_Linux + 227)
-#define __NR_get_mempolicy              (__NR_Linux + 228)
-#define __NR_set_mempolicy              (__NR_Linux + 229)
-#define __NR_mq_open                    (__NR_Linux + 230)
-#define __NR_mq_unlink                  (__NR_Linux + 231)
-#define __NR_mq_timedsend               (__NR_Linux + 232)
-#define __NR_mq_timedreceive            (__NR_Linux + 233)
-#define __NR_mq_notify                  (__NR_Linux + 234)
-#define __NR_mq_getsetattr              (__NR_Linux + 235)
-#define __NR_vserver                    (__NR_Linux + 236)
-#define __NR_waitid                     (__NR_Linux + 237)
-/* #define __NR_sys_setaltroot          (__NR_Linux + 238) */
-#define __NR_add_key                    (__NR_Linux + 239)
-#define __NR_request_key                (__NR_Linux + 240)
-#define __NR_keyctl                     (__NR_Linux + 241)
-#define __NR_set_thread_area            (__NR_Linux + 242)
-#define __NR_inotify_init               (__NR_Linux + 243)
-#define __NR_inotify_add_watch          (__NR_Linux + 244)
-#define __NR_inotify_rm_watch           (__NR_Linux + 245)
-#define __NR_migrate_pages              (__NR_Linux + 246)
-#define __NR_openat                     (__NR_Linux + 247)
-#define __NR_mkdirat                    (__NR_Linux + 248)
-#define __NR_mknodat                    (__NR_Linux + 249)
-#define __NR_fchownat                   (__NR_Linux + 250)
-#define __NR_futimesat                  (__NR_Linux + 251)
-#define __NR_newfstatat                 (__NR_Linux + 252)
-#define __NR_unlinkat                   (__NR_Linux + 253)
-#define __NR_renameat                   (__NR_Linux + 254)
-#define __NR_linkat                     (__NR_Linux + 255)
-#define __NR_symlinkat                  (__NR_Linux + 256)
-#define __NR_readlinkat                 (__NR_Linux + 257)
-#define __NR_fchmodat                   (__NR_Linux + 258)
-#define __NR_faccessat                  (__NR_Linux + 259)
-#define __NR_pselect6                   (__NR_Linux + 260)
-#define __NR_ppoll                      (__NR_Linux + 261)
-#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)
-#define __NR_set_robust_list            (__NR_Linux + 268)
-#define __NR_get_robust_list            (__NR_Linux + 269)
-#define __NR_kexec_load                 (__NR_Linux + 270)
-#define __NR_getcpu                     (__NR_Linux + 271)
-#define __NR_epoll_pwait                (__NR_Linux + 272)
-#define __NR_ioprio_set                 (__NR_Linux + 273)
-#define __NR_ioprio_get                 (__NR_Linux + 274)
-#define __NR_utimensat                  (__NR_Linux + 275)
-#define __NR_signalfd                   (__NR_Linux + 276)
-#define __NR_timerfd                    (__NR_Linux + 277)
-#define __NR_eventfd                    (__NR_Linux + 278)
-#define __NR_fallocate                  (__NR_Linux + 279)
-#define __NR_timerfd_create             (__NR_Linux + 280)
-#define __NR_timerfd_gettime            (__NR_Linux + 281)
-#define __NR_timerfd_settime            (__NR_Linux + 282)
-#define __NR_signalfd4                  (__NR_Linux + 283)
-#define __NR_eventfd2                   (__NR_Linux + 284)
-#define __NR_epoll_create1              (__NR_Linux + 285)
-#define __NR_dup3                       (__NR_Linux + 286)
-#define __NR_pipe2                      (__NR_Linux + 287)
-#define __NR_inotify_init1              (__NR_Linux + 288)
-#define __NR_preadv                     (__NR_Linux + 289)
-#define __NR_pwritev                    (__NR_Linux + 290)
-#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 291)
-#define __NR_perf_event_open            (__NR_Linux + 292)
-#define __NR_accept4                    (__NR_Linux + 293)
-#define __NR_recvmmsg                   (__NR_Linux + 294)
-#define __NR_fanotify_init              (__NR_Linux + 295)
-#define __NR_fanotify_mark              (__NR_Linux + 296)
-#define __NR_prlimit64                  (__NR_Linux + 297)
-#define __NR_name_to_handle_at          (__NR_Linux + 298)
-#define __NR_open_by_handle_at          (__NR_Linux + 299)
-#define __NR_clock_adjtime              (__NR_Linux + 300)
-#define __NR_syncfs                     (__NR_Linux + 301)
-#define __NR_sendmmsg                   (__NR_Linux + 302)
-#define __NR_setns                      (__NR_Linux + 303)
-#define __NR_process_vm_readv           (__NR_Linux + 304)
-#define __NR_process_vm_writev          (__NR_Linux + 305)
-#define __NR_kcmp                       (__NR_Linux + 306)
-/*
- * Offset of the last Linux 64-bit flavoured syscall
- */
-#define __NR_Linux_syscalls             306
-#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
-#define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          306
-#if _MIPS_SIM == _MIPS_SIM_NABI32
-/*
- * Linux N32 syscalls are in the range from 6000 to 6999.
- */
-#define __NR_Linux                      6000
-#define __NR_read                       (__NR_Linux +   0)
-#define __NR_write                      (__NR_Linux +   1)
-#define __NR_open                       (__NR_Linux +   2)
-#define __NR_close                      (__NR_Linux +   3)
-#define __NR_stat                       (__NR_Linux +   4)
-#define __NR_fstat                      (__NR_Linux +   5)
-#define __NR_lstat                      (__NR_Linux +   6)
-#define __NR_poll                       (__NR_Linux +   7)
-#define __NR_lseek                      (__NR_Linux +   8)
-#define __NR_mmap                       (__NR_Linux +   9)
-#define __NR_mprotect                   (__NR_Linux +  10)
-#define __NR_munmap                     (__NR_Linux +  11)
-#define __NR_brk                        (__NR_Linux +  12)
-#define __NR_rt_sigaction               (__NR_Linux +  13)
-#define __NR_rt_sigprocmask             (__NR_Linux +  14)
-#define __NR_ioctl                      (__NR_Linux +  15)
-#define __NR_pread64                    (__NR_Linux +  16)
-#define __NR_pwrite64                   (__NR_Linux +  17)
-#define __NR_readv                      (__NR_Linux +  18)
-#define __NR_writev                     (__NR_Linux +  19)
-#define __NR_access                     (__NR_Linux +  20)
-#define __NR_pipe                       (__NR_Linux +  21)
-#define __NR__newselect                 (__NR_Linux +  22)
-#define __NR_sched_yield                (__NR_Linux +  23)
-#define __NR_mremap                     (__NR_Linux +  24)
-#define __NR_msync                      (__NR_Linux +  25)
-#define __NR_mincore                    (__NR_Linux +  26)
-#define __NR_madvise                    (__NR_Linux +  27)
-#define __NR_shmget                     (__NR_Linux +  28)
-#define __NR_shmat                      (__NR_Linux +  29)
-#define __NR_shmctl                     (__NR_Linux +  30)
-#define __NR_dup                        (__NR_Linux +  31)
-#define __NR_dup2                       (__NR_Linux +  32)
-#define __NR_pause                      (__NR_Linux +  33)
-#define __NR_nanosleep                  (__NR_Linux +  34)
-#define __NR_getitimer                  (__NR_Linux +  35)
-#define __NR_setitimer                  (__NR_Linux +  36)
-#define __NR_alarm                      (__NR_Linux +  37)
-#define __NR_getpid                     (__NR_Linux +  38)
-#define __NR_sendfile                   (__NR_Linux +  39)
-#define __NR_socket                     (__NR_Linux +  40)
-#define __NR_connect                    (__NR_Linux +  41)
-#define __NR_accept                     (__NR_Linux +  42)
-#define __NR_sendto                     (__NR_Linux +  43)
-#define __NR_recvfrom                   (__NR_Linux +  44)
-#define __NR_sendmsg                    (__NR_Linux +  45)
-#define __NR_recvmsg                    (__NR_Linux +  46)
-#define __NR_shutdown                   (__NR_Linux +  47)
-#define __NR_bind                       (__NR_Linux +  48)
-#define __NR_listen                     (__NR_Linux +  49)
-#define __NR_getsockname                (__NR_Linux +  50)
-#define __NR_getpeername                (__NR_Linux +  51)
-#define __NR_socketpair                 (__NR_Linux +  52)
-#define __NR_setsockopt                 (__NR_Linux +  53)
-#define __NR_getsockopt                 (__NR_Linux +  54)
-#define __NR_clone                      (__NR_Linux +  55)
-#define __NR_fork                       (__NR_Linux +  56)
-#define __NR_execve                     (__NR_Linux +  57)
-#define __NR_exit                       (__NR_Linux +  58)
-#define __NR_wait4                      (__NR_Linux +  59)
-#define __NR_kill                       (__NR_Linux +  60)
-#define __NR_uname                      (__NR_Linux +  61)
-#define __NR_semget                     (__NR_Linux +  62)
-#define __NR_semop                      (__NR_Linux +  63)
-#define __NR_semctl                     (__NR_Linux +  64)
-#define __NR_shmdt                      (__NR_Linux +  65)
-#define __NR_msgget                     (__NR_Linux +  66)
-#define __NR_msgsnd                     (__NR_Linux +  67)
-#define __NR_msgrcv                     (__NR_Linux +  68)
-#define __NR_msgctl                     (__NR_Linux +  69)
-#define __NR_fcntl                      (__NR_Linux +  70)
-#define __NR_flock                      (__NR_Linux +  71)
-#define __NR_fsync                      (__NR_Linux +  72)
-#define __NR_fdatasync                  (__NR_Linux +  73)
-#define __NR_truncate                   (__NR_Linux +  74)
-#define __NR_ftruncate                  (__NR_Linux +  75)
-#define __NR_getdents                   (__NR_Linux +  76)
-#define __NR_getcwd                     (__NR_Linux +  77)
-#define __NR_chdir                      (__NR_Linux +  78)
-#define __NR_fchdir                     (__NR_Linux +  79)
-#define __NR_rename                     (__NR_Linux +  80)
-#define __NR_mkdir                      (__NR_Linux +  81)
-#define __NR_rmdir                      (__NR_Linux +  82)
-#define __NR_creat                      (__NR_Linux +  83)
-#define __NR_link                       (__NR_Linux +  84)
-#define __NR_unlink                     (__NR_Linux +  85)
-#define __NR_symlink                    (__NR_Linux +  86)
-#define __NR_readlink                   (__NR_Linux +  87)
-#define __NR_chmod                      (__NR_Linux +  88)
-#define __NR_fchmod                     (__NR_Linux +  89)
-#define __NR_chown                      (__NR_Linux +  90)
-#define __NR_fchown                     (__NR_Linux +  91)
-#define __NR_lchown                     (__NR_Linux +  92)
-#define __NR_umask                      (__NR_Linux +  93)
-#define __NR_gettimeofday               (__NR_Linux +  94)
-#define __NR_getrlimit                  (__NR_Linux +  95)
-#define __NR_getrusage                  (__NR_Linux +  96)
-#define __NR_sysinfo                    (__NR_Linux +  97)
-#define __NR_times                      (__NR_Linux +  98)
-#define __NR_ptrace                     (__NR_Linux +  99)
-#define __NR_getuid                     (__NR_Linux + 100)
-#define __NR_syslog                     (__NR_Linux + 101)
-#define __NR_getgid                     (__NR_Linux + 102)
-#define __NR_setuid                     (__NR_Linux + 103)
-#define __NR_setgid                     (__NR_Linux + 104)
-#define __NR_geteuid                    (__NR_Linux + 105)
-#define __NR_getegid                    (__NR_Linux + 106)
-#define __NR_setpgid                    (__NR_Linux + 107)
-#define __NR_getppid                    (__NR_Linux + 108)
-#define __NR_getpgrp                    (__NR_Linux + 109)
-#define __NR_setsid                     (__NR_Linux + 110)
-#define __NR_setreuid                   (__NR_Linux + 111)
-#define __NR_setregid                   (__NR_Linux + 112)
-#define __NR_getgroups                  (__NR_Linux + 113)
-#define __NR_setgroups                  (__NR_Linux + 114)
-#define __NR_setresuid                  (__NR_Linux + 115)
-#define __NR_getresuid                  (__NR_Linux + 116)
-#define __NR_setresgid                  (__NR_Linux + 117)
-#define __NR_getresgid                  (__NR_Linux + 118)
-#define __NR_getpgid                    (__NR_Linux + 119)
-#define __NR_setfsuid                   (__NR_Linux + 120)
-#define __NR_setfsgid                   (__NR_Linux + 121)
-#define __NR_getsid                     (__NR_Linux + 122)
-#define __NR_capget                     (__NR_Linux + 123)
-#define __NR_capset                     (__NR_Linux + 124)
-#define __NR_rt_sigpending              (__NR_Linux + 125)
-#define __NR_rt_sigtimedwait            (__NR_Linux + 126)
-#define __NR_rt_sigqueueinfo            (__NR_Linux + 127)
-#define __NR_rt_sigsuspend              (__NR_Linux + 128)
-#define __NR_sigaltstack                (__NR_Linux + 129)
-#define __NR_utime                      (__NR_Linux + 130)
-#define __NR_mknod                      (__NR_Linux + 131)
-#define __NR_personality                (__NR_Linux + 132)
-#define __NR_ustat                      (__NR_Linux + 133)
-#define __NR_statfs                     (__NR_Linux + 134)
-#define __NR_fstatfs                    (__NR_Linux + 135)
-#define __NR_sysfs                      (__NR_Linux + 136)
-#define __NR_getpriority                (__NR_Linux + 137)
-#define __NR_setpriority                (__NR_Linux + 138)
-#define __NR_sched_setparam             (__NR_Linux + 139)
-#define __NR_sched_getparam             (__NR_Linux + 140)
-#define __NR_sched_setscheduler         (__NR_Linux + 141)
-#define __NR_sched_getscheduler         (__NR_Linux + 142)
-#define __NR_sched_get_priority_max     (__NR_Linux + 143)
-#define __NR_sched_get_priority_min     (__NR_Linux + 144)
-#define __NR_sched_rr_get_interval      (__NR_Linux + 145)
-#define __NR_mlock                      (__NR_Linux + 146)
-#define __NR_munlock                    (__NR_Linux + 147)
-#define __NR_mlockall                   (__NR_Linux + 148)
-#define __NR_munlockall                 (__NR_Linux + 149)
-#define __NR_vhangup                    (__NR_Linux + 150)
-#define __NR_pivot_root                 (__NR_Linux + 151)
-#define __NR__sysctl                    (__NR_Linux + 152)
-#define __NR_prctl                      (__NR_Linux + 153)
-#define __NR_adjtimex                   (__NR_Linux + 154)
-#define __NR_setrlimit                  (__NR_Linux + 155)
-#define __NR_chroot                     (__NR_Linux + 156)
-#define __NR_sync                       (__NR_Linux + 157)
-#define __NR_acct                       (__NR_Linux + 158)
-#define __NR_settimeofday               (__NR_Linux + 159)
-#define __NR_mount                      (__NR_Linux + 160)
-#define __NR_umount2                    (__NR_Linux + 161)
-#define __NR_swapon                     (__NR_Linux + 162)
-#define __NR_swapoff                    (__NR_Linux + 163)
-#define __NR_reboot                     (__NR_Linux + 164)
-#define __NR_sethostname                (__NR_Linux + 165)
-#define __NR_setdomainname              (__NR_Linux + 166)
-#define __NR_create_module              (__NR_Linux + 167)
-#define __NR_init_module                (__NR_Linux + 168)
-#define __NR_delete_module              (__NR_Linux + 169)
-#define __NR_get_kernel_syms            (__NR_Linux + 170)
-#define __NR_query_module               (__NR_Linux + 171)
-#define __NR_quotactl                   (__NR_Linux + 172)
-#define __NR_nfsservctl                 (__NR_Linux + 173)
-#define __NR_getpmsg                    (__NR_Linux + 174)
-#define __NR_putpmsg                    (__NR_Linux + 175)
-#define __NR_afs_syscall                (__NR_Linux + 176)
-#define __NR_reserved177                (__NR_Linux + 177)
-#define __NR_gettid                     (__NR_Linux + 178)
-#define __NR_readahead                  (__NR_Linux + 179)
-#define __NR_setxattr                   (__NR_Linux + 180)
-#define __NR_lsetxattr                  (__NR_Linux + 181)
-#define __NR_fsetxattr                  (__NR_Linux + 182)
-#define __NR_getxattr                   (__NR_Linux + 183)
-#define __NR_lgetxattr                  (__NR_Linux + 184)
-#define __NR_fgetxattr                  (__NR_Linux + 185)
-#define __NR_listxattr                  (__NR_Linux + 186)
-#define __NR_llistxattr                 (__NR_Linux + 187)
-#define __NR_flistxattr                 (__NR_Linux + 188)
-#define __NR_removexattr                (__NR_Linux + 189)
-#define __NR_lremovexattr               (__NR_Linux + 190)
-#define __NR_fremovexattr               (__NR_Linux + 191)
-#define __NR_tkill                      (__NR_Linux + 192)
-#define __NR_reserved193                (__NR_Linux + 193)
-#define __NR_futex                      (__NR_Linux + 194)
-#define __NR_sched_setaffinity          (__NR_Linux + 195)
-#define __NR_sched_getaffinity          (__NR_Linux + 196)
-#define __NR_cacheflush                 (__NR_Linux + 197)
-#define __NR_cachectl                   (__NR_Linux + 198)
-#define __NR_sysmips                    (__NR_Linux + 199)
-#define __NR_io_setup                   (__NR_Linux + 200)
-#define __NR_io_destroy                 (__NR_Linux + 201)
-#define __NR_io_getevents               (__NR_Linux + 202)
-#define __NR_io_submit                  (__NR_Linux + 203)
-#define __NR_io_cancel                  (__NR_Linux + 204)
-#define __NR_exit_group                 (__NR_Linux + 205)
-#define __NR_lookup_dcookie             (__NR_Linux + 206)
-#define __NR_epoll_create               (__NR_Linux + 207)
-#define __NR_epoll_ctl                  (__NR_Linux + 208)
-#define __NR_epoll_wait                 (__NR_Linux + 209)
-#define __NR_remap_file_pages           (__NR_Linux + 210)
-#define __NR_rt_sigreturn               (__NR_Linux + 211)
-#define __NR_fcntl64                    (__NR_Linux + 212)
-#define __NR_set_tid_address            (__NR_Linux + 213)
-#define __NR_restart_syscall            (__NR_Linux + 214)
-#define __NR_semtimedop                 (__NR_Linux + 215)
-#define __NR_fadvise64                  (__NR_Linux + 216)
-#define __NR_statfs64                   (__NR_Linux + 217)
-#define __NR_fstatfs64                  (__NR_Linux + 218)
-#define __NR_sendfile64                 (__NR_Linux + 219)
-#define __NR_timer_create               (__NR_Linux + 220)
-#define __NR_timer_settime              (__NR_Linux + 221)
-#define __NR_timer_gettime              (__NR_Linux + 222)
-#define __NR_timer_getoverrun           (__NR_Linux + 223)
-#define __NR_timer_delete               (__NR_Linux + 224)
-#define __NR_clock_settime              (__NR_Linux + 225)
-#define __NR_clock_gettime              (__NR_Linux + 226)
-#define __NR_clock_getres               (__NR_Linux + 227)
-#define __NR_clock_nanosleep            (__NR_Linux + 228)
-#define __NR_tgkill                     (__NR_Linux + 229)
-#define __NR_utimes                     (__NR_Linux + 230)
-#define __NR_mbind                      (__NR_Linux + 231)
-#define __NR_get_mempolicy              (__NR_Linux + 232)
-#define __NR_set_mempolicy              (__NR_Linux + 233)
-#define __NR_mq_open                    (__NR_Linux + 234)
-#define __NR_mq_unlink                  (__NR_Linux + 235)
-#define __NR_mq_timedsend               (__NR_Linux + 236)
-#define __NR_mq_timedreceive            (__NR_Linux + 237)
-#define __NR_mq_notify                  (__NR_Linux + 238)
-#define __NR_mq_getsetattr              (__NR_Linux + 239)
-#define __NR_vserver                    (__NR_Linux + 240)
-#define __NR_waitid                     (__NR_Linux + 241)
-/* #define __NR_sys_setaltroot          (__NR_Linux + 242) */
-#define __NR_add_key                    (__NR_Linux + 243)
-#define __NR_request_key                (__NR_Linux + 244)
-#define __NR_keyctl                     (__NR_Linux + 245)
-#define __NR_set_thread_area            (__NR_Linux + 246)
-#define __NR_inotify_init               (__NR_Linux + 247)
-#define __NR_inotify_add_watch          (__NR_Linux + 248)
-#define __NR_inotify_rm_watch           (__NR_Linux + 249)
-#define __NR_migrate_pages              (__NR_Linux + 250)
-#define __NR_openat                     (__NR_Linux + 251)
-#define __NR_mkdirat                    (__NR_Linux + 252)
-#define __NR_mknodat                    (__NR_Linux + 253)
-#define __NR_fchownat                   (__NR_Linux + 254)
-#define __NR_futimesat                  (__NR_Linux + 255)
-#define __NR_newfstatat                 (__NR_Linux + 256)
-#define __NR_unlinkat                   (__NR_Linux + 257)
-#define __NR_renameat                   (__NR_Linux + 258)
-#define __NR_linkat                     (__NR_Linux + 259)
-#define __NR_symlinkat                  (__NR_Linux + 260)
-#define __NR_readlinkat                 (__NR_Linux + 261)
-#define __NR_fchmodat                   (__NR_Linux + 262)
-#define __NR_faccessat                  (__NR_Linux + 263)
-#define __NR_pselect6                   (__NR_Linux + 264)
-#define __NR_ppoll                      (__NR_Linux + 265)
-#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)
-#define __NR_set_robust_list            (__NR_Linux + 272)
-#define __NR_get_robust_list            (__NR_Linux + 273)
-#define __NR_kexec_load                 (__NR_Linux + 274)
-#define __NR_getcpu                     (__NR_Linux + 275)
-#define __NR_epoll_pwait                (__NR_Linux + 276)
-#define __NR_ioprio_set                 (__NR_Linux + 277)
-#define __NR_ioprio_get                 (__NR_Linux + 278)
-#define __NR_utimensat                  (__NR_Linux + 279)
-#define __NR_signalfd                   (__NR_Linux + 280)
-#define __NR_timerfd                    (__NR_Linux + 281)
-#define __NR_eventfd                    (__NR_Linux + 282)
-#define __NR_fallocate                  (__NR_Linux + 283)
-#define __NR_timerfd_create             (__NR_Linux + 284)
-#define __NR_timerfd_gettime            (__NR_Linux + 285)
-#define __NR_timerfd_settime            (__NR_Linux + 286)
-#define __NR_signalfd4                  (__NR_Linux + 287)
-#define __NR_eventfd2                   (__NR_Linux + 288)
-#define __NR_epoll_create1              (__NR_Linux + 289)
-#define __NR_dup3                       (__NR_Linux + 290)
-#define __NR_pipe2                      (__NR_Linux + 291)
-#define __NR_inotify_init1              (__NR_Linux + 292)
-#define __NR_preadv                     (__NR_Linux + 293)
-#define __NR_pwritev                    (__NR_Linux + 294)
-#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 295)
-#define __NR_perf_event_open            (__NR_Linux + 296)
-#define __NR_accept4                    (__NR_Linux + 297)
-#define __NR_recvmmsg                   (__NR_Linux + 298)
-#define __NR_getdents64                 (__NR_Linux + 299)
-#define __NR_fanotify_init              (__NR_Linux + 300)
-#define __NR_fanotify_mark              (__NR_Linux + 301)
-#define __NR_prlimit64                  (__NR_Linux + 302)
-#define __NR_name_to_handle_at          (__NR_Linux + 303)
-#define __NR_open_by_handle_at          (__NR_Linux + 304)
-#define __NR_clock_adjtime              (__NR_Linux + 305)
-#define __NR_syncfs                     (__NR_Linux + 306)
-#define __NR_sendmmsg                   (__NR_Linux + 307)
-#define __NR_setns                      (__NR_Linux + 308)
-#define __NR_process_vm_readv           (__NR_Linux + 309)
-#define __NR_process_vm_writev          (__NR_Linux + 310)
-#define __NR_kcmp                       (__NR_Linux + 311)
-/*
- * Offset of the last N32 flavoured syscall
- */
-#define __NR_Linux_syscalls             311
-#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
-#define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         311
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
@@ -1089,5 +70,4 @@
 */
 #define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall")
-#endif /* __KERNEL__ */
 #endif /* _ASM_UNISTD_H */
diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild
index baebb3da1d4..a1a0452ac18 100644
--- a/arch/mips/include/uapi/asm/Kbuild
+++ b/arch/mips/include/uapi/asm/Kbuild
@@ -1,3 +1,37 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += cachectl.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += kvm_para.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += param.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += ptrace.h
+header-y += resource.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += sgidefs.h
+header-y += shmbuf.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += sysmips.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += unistd.h
diff --git a/arch/mips/include/asm/auxvec.h b/arch/mips/include/uapi/asm/auxvec.h
index 7cf7f2d2194..7cf7f2d2194 100644
--- a/arch/mips/include/asm/auxvec.h
+++ b/arch/mips/include/uapi/asm/auxvec.h
diff --git a/arch/mips/include/asm/bitsperlong.h b/arch/mips/include/uapi/asm/bitsperlong.h
index 3e4c10a8e78..3e4c10a8e78 100644
--- a/arch/mips/include/asm/bitsperlong.h
+++ b/arch/mips/include/uapi/asm/bitsperlong.h
diff --git a/arch/mips/include/asm/byteorder.h b/arch/mips/include/uapi/asm/byteorder.h
index 9579051ff1c..9579051ff1c 100644
--- a/arch/mips/include/asm/byteorder.h
+++ b/arch/mips/include/uapi/asm/byteorder.h
diff --git a/arch/mips/include/asm/cachectl.h b/arch/mips/include/uapi/asm/cachectl.h
index f3ce721861d..f3ce721861d 100644
--- a/arch/mips/include/asm/cachectl.h
+++ b/arch/mips/include/uapi/asm/cachectl.h
diff --git a/arch/mips/include/uapi/asm/errno.h b/arch/mips/include/uapi/asm/errno.h
new file mode 100644
index 00000000000..bd67b15042e
--- /dev/null
+++ b/arch/mips/include/uapi/asm/errno.h
@@ -0,0 +1,129 @@
+/*
+ * 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) 1995, 1999, 2001, 2002 by Ralf Baechle
+ */
+#ifndef _UAPI_ASM_ERRNO_H
+#define _UAPI_ASM_ERRNO_H
+/*
+ * These error numbers are intended to be MIPS ABI compatible
+ */
+#include <asm-generic/errno-base.h>
+#define ENOMSG          35      /* No message of desired type */
+#define EIDRM           36      /* Identifier removed */
+#define ECHRNG          37      /* Channel number out of range */
+#define EL2NSYNC        38      /* Level 2 not synchronized */
+#define EL3HLT          39      /* Level 3 halted */
+#define EL3RST          40      /* Level 3 reset */
+#define ELNRNG          41      /* Link number out of range */
+#define EUNATCH         42      /* Protocol driver not attached */
+#define ENOCSI          43      /* No CSI structure available */
+#define EL2HLT          44      /* Level 2 halted */
+#define EDEADLK         45      /* Resource deadlock would occur */
+#define ENOLCK          46      /* No record locks available */
+#define EBADE           50      /* Invalid exchange */
+#define EBADR           51      /* Invalid request descriptor */
+#define EXFULL          52      /* Exchange full */
+#define ENOANO          53      /* No anode */
+#define EBADRQC         54      /* Invalid request code */
+#define EBADSLT         55      /* Invalid slot */
+#define EDEADLOCK       56      /* File locking deadlock error */
+#define EBFONT          59      /* Bad font file format */
+#define ENOSTR          60      /* Device not a stream */
+#define ENODATA         61      /* No data available */
+#define ETIME           62      /* Timer expired */
+#define ENOSR           63      /* Out of streams resources */
+#define ENONET          64      /* Machine is not on the network */
+#define ENOPKG          65      /* Package not installed */
+#define EREMOTE         66      /* Object is remote */
+#define ENOLINK         67      /* Link has been severed */
+#define EADV            68      /* Advertise error */
+#define ESRMNT          69      /* Srmount error */
+#define ECOMM           70      /* Communication error on send */
+#define EPROTO          71      /* Protocol error */
+#define EDOTDOT         73      /* RFS specific error */
+#define EMULTIHOP       74      /* Multihop attempted */
+#define EBADMSG         77      /* Not a data message */
+#define ENAMETOOLONG    78      /* File name too long */
+#define EOVERFLOW       79      /* Value too large for defined data type */
+#define ENOTUNIQ        80      /* Name not unique on network */
+#define EBADFD          81      /* File descriptor in bad state */
+#define EREMCHG         82      /* Remote address changed */
+#define ELIBACC         83      /* Can not access a needed shared library */
+#define ELIBBAD         84      /* Accessing a corrupted shared library */
+#define ELIBSCN         85      /* .lib section in a.out corrupted */
+#define ELIBMAX         86      /* Attempting to link in too many shared libraries */
+#define ELIBEXEC        87      /* Cannot exec a shared library directly */
+#define EILSEQ          88      /* Illegal byte sequence */
+#define ENOSYS          89      /* Function not implemented */
+#define ELOOP           90      /* Too many symbolic links encountered */
+#define ERESTART        91      /* Interrupted system call should be restarted */
+#define ESTRPIPE        92      /* Streams pipe error */
+#define ENOTEMPTY       93      /* Directory not empty */
+#define EUSERS          94      /* Too many users */
+#define ENOTSOCK        95      /* Socket operation on non-socket */
+#define EDESTADDRREQ    96      /* Destination address required */
+#define EMSGSIZE        97      /* Message too long */
+#define EPROTOTYPE      98      /* Protocol wrong type for socket */
+#define ENOPROTOOPT     99      /* Protocol not available */
+#define EPROTONOSUPPORT 120     /* Protocol not supported */
+#define ESOCKTNOSUPPORT 121     /* Socket type not supported */
+#define EOPNOTSUPP      122     /* Operation not supported on transport endpoint */
+#define EPFNOSUPPORT    123     /* Protocol family not supported */
+#define EAFNOSUPPORT    124     /* Address family not supported by protocol */
+#define EADDRINUSE      125     /* Address already in use */
+#define EADDRNOTAVAIL   126     /* Cannot assign requested address */
+#define ENETDOWN        127     /* Network is down */
+#define ENETUNREACH     128     /* Network is unreachable */
+#define ENETRESET       129     /* Network dropped connection because of reset */
+#define ECONNABORTED    130     /* Software caused connection abort */
+#define ECONNRESET      131     /* Connection reset by peer */
+#define ENOBUFS         132     /* No buffer space available */
+#define EISCONN         133     /* Transport endpoint is already connected */
+#define ENOTCONN        134     /* Transport endpoint is not connected */
+#define EUCLEAN         135     /* Structure needs cleaning */
+#define ENOTNAM         137     /* Not a XENIX named type file */
+#define ENAVAIL         138     /* No XENIX semaphores available */
+#define EISNAM          139     /* Is a named type file */
+#define EREMOTEIO       140     /* Remote I/O error */
+#define EINIT           141     /* Reserved */
+#define EREMDEV         142     /* Error 142 */
+#define ESHUTDOWN       143     /* Cannot send after transport endpoint shutdown */
+#define ETOOMANYREFS    144     /* Too many references: cannot splice */
+#define ETIMEDOUT       145     /* Connection timed out */
+#define ECONNREFUSED    146     /* Connection refused */
+#define EHOSTDOWN       147     /* Host is down */
+#define EHOSTUNREACH    148     /* No route to host */
+#define EWOULDBLOCK     EAGAIN  /* Operation would block */
+#define EALREADY        149     /* Operation already in progress */
+#define EINPROGRESS     150     /* Operation now in progress */
+#define ESTALE          151     /* Stale NFS file handle */
+#define ECANCELED       158     /* AIO operation canceled */
+/*
+ * These error are Linux extensions.
+ */
+#define ENOMEDIUM       159     /* No medium found */
+#define EMEDIUMTYPE     160     /* Wrong medium type */
+#define ENOKEY          161     /* Required key not available */
+#define EKEYEXPIRED     162     /* Key has expired */
+#define EKEYREVOKED     163     /* Key has been revoked */
+#define EKEYREJECTED    164     /* Key was rejected by service */
+/* for robust mutexes */
+#define EOWNERDEAD      165     /* Owner died */
+#define ENOTRECOVERABLE 166     /* State not recoverable */
+#define ERFKILL         167     /* Operation not possible due to RF-kill */
+#define EHWPOISON       168     /* Memory page has hardware error */
+#define EDQUOT          1133    /* Quota exceeded */
+#endif /* _UAPI_ASM_ERRNO_H */
diff --git a/arch/mips/include/asm/fcntl.h b/arch/mips/include/uapi/asm/fcntl.h
index 75eddedcfc3..75eddedcfc3 100644
--- a/arch/mips/include/asm/fcntl.h
+++ b/arch/mips/include/uapi/asm/fcntl.h
diff --git a/arch/mips/include/asm/ioctl.h b/arch/mips/include/uapi/asm/ioctl.h
index c515a1a4c47..c515a1a4c47 100644
--- a/arch/mips/include/asm/ioctl.h
+++ b/arch/mips/include/uapi/asm/ioctl.h
diff --git a/arch/mips/include/asm/ioctls.h b/arch/mips/include/uapi/asm/ioctls.h
index 92403c3d600..92403c3d600 100644
--- a/arch/mips/include/asm/ioctls.h
+++ b/arch/mips/include/uapi/asm/ioctls.h
diff --git a/arch/mips/include/asm/ipcbuf.h b/arch/mips/include/uapi/asm/ipcbuf.h
index 84c7e51cb6d..84c7e51cb6d 100644
--- a/arch/mips/include/asm/ipcbuf.h
+++ b/arch/mips/include/uapi/asm/ipcbuf.h
diff --git a/arch/mips/include/asm/kvm_para.h b/arch/mips/include/uapi/asm/kvm_para.h
index 14fab8f0b95..14fab8f0b95 100644
--- a/arch/mips/include/asm/kvm_para.h
+++ b/arch/mips/include/uapi/asm/kvm_para.h
diff --git a/arch/mips/include/asm/mman.h b/arch/mips/include/uapi/asm/mman.h
index 46d3da0d4b9..46d3da0d4b9 100644
--- a/arch/mips/include/asm/mman.h
+++ b/arch/mips/include/uapi/asm/mman.h
diff --git a/arch/mips/include/asm/msgbuf.h b/arch/mips/include/uapi/asm/msgbuf.h
index 0d6c7f14de3..0d6c7f14de3 100644
--- a/arch/mips/include/asm/msgbuf.h
+++ b/arch/mips/include/uapi/asm/msgbuf.h
diff --git a/arch/mips/include/asm/param.h b/arch/mips/include/uapi/asm/param.h
index da3920fce9a..da3920fce9a 100644
--- a/arch/mips/include/asm/param.h
+++ b/arch/mips/include/uapi/asm/param.h
diff --git a/arch/mips/include/asm/poll.h b/arch/mips/include/uapi/asm/poll.h
index 47b95208043..47b95208043 100644
--- a/arch/mips/include/asm/poll.h
+++ b/arch/mips/include/uapi/asm/poll.h
diff --git a/arch/mips/include/asm/posix_types.h b/arch/mips/include/uapi/asm/posix_types.h
index fa03ec3fbf8..fa03ec3fbf8 100644
--- a/arch/mips/include/asm/posix_types.h
+++ b/arch/mips/include/uapi/asm/posix_types.h
diff --git a/arch/mips/include/uapi/asm/ptrace.h b/arch/mips/include/uapi/asm/ptrace.h
new file mode 100644
index 00000000000..1bc1f52f40d
--- /dev/null
+++ b/arch/mips/include/uapi/asm/ptrace.h
@@ -0,0 +1,116 @@
+/*
+ * 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) 1994, 95, 96, 97, 98, 99, 2000 by Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_PTRACE_H
+#define _UAPI_ASM_PTRACE_H
+/* 0 - 31 are integer registers, 32 - 63 are fp registers.  */
+#define FPR_BASE        32
+#define PC              64
+#define CAUSE           65
+#define BADVADDR        66
+#define MMHI            67
+#define MMLO            68
+#define FPC_CSR         69
+#define FPC_EIR         70
+#define DSP_BASE        71              /* 3 more hi / lo register pairs */
+#define DSP_CONTROL     77
+#define ACX             78
+/*
+ * This struct defines the way the registers are stored on the stack during a
+ * system call/exception. As usual the registers k0/k1 aren't being saved.
+ */
+struct pt_regs {
+#ifdef CONFIG_32BIT
+        /* Pad bytes for argument save space on the stack. */
+        unsigned long pad0[6];
+#endif
+        /* Saved main processor registers. */
+        unsigned long regs[32];
+        /* Saved special registers. */
+        unsigned long cp0_status;
+        unsigned long hi;
+        unsigned long lo;
+#ifdef CONFIG_CPU_HAS_SMARTMIPS
+        unsigned long acx;
+#endif
+        unsigned long cp0_badvaddr;
+        unsigned long cp0_cause;
+        unsigned long cp0_epc;
+#ifdef CONFIG_MIPS_MT_SMTC
+        unsigned long cp0_tcstatus;
+#endif /* CONFIG_MIPS_MT_SMTC */
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+        unsigned long long mpl[3];        /* MTM{0,1,2} */
+        unsigned long long mtp[3];        /* MTP{0,1,2} */
+#endif
+} __attribute__ ((aligned (8)));
+/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
+#define PTRACE_GETREGS          12
+#define PTRACE_SETREGS          13
+#define PTRACE_GETFPREGS                14
+#define PTRACE_SETFPREGS                15
+/* #define PTRACE_GETFPXREGS            18 */
+/* #define PTRACE_SETFPXREGS            19 */
+#define PTRACE_OLDSETOPTIONS    21
+#define PTRACE_GET_THREAD_AREA  25
+#define PTRACE_SET_THREAD_AREA  26
+/* Calls to trace a 64bit program from a 32bit program.  */
+#define PTRACE_PEEKTEXT_3264    0xc0
+#define PTRACE_PEEKDATA_3264    0xc1
+#define PTRACE_POKETEXT_3264    0xc2
+#define PTRACE_POKEDATA_3264    0xc3
+#define PTRACE_GET_THREAD_AREA_3264     0xc4
+/* Read and write watchpoint registers.  */
+enum pt_watch_style {
+        pt_watch_style_mips32,
+        pt_watch_style_mips64
+};
+struct mips32_watch_regs {
+        unsigned int watchlo[8];
+        /* Lower 16 bits of watchhi. */
+        unsigned short watchhi[8];
+        /* Valid mask and I R W bits.
+         * bit 0 -- 1 if W bit is usable.
+         * bit 1 -- 1 if R bit is usable.
+         * bit 2 -- 1 if I bit is usable.
+         * bits 3 - 11 -- Valid watchhi mask bits.
+         */
+        unsigned short watch_masks[8];
+        /* The number of valid watch register pairs.  */
+        unsigned int num_valid;
+} __attribute__((aligned(8)));
+struct mips64_watch_regs {
+        unsigned long long watchlo[8];
+        unsigned short watchhi[8];
+        unsigned short watch_masks[8];
+        unsigned int num_valid;
+} __attribute__((aligned(8)));
+struct pt_watch_regs {
+        enum pt_watch_style style;
+        union {
+                struct mips32_watch_regs mips32;
+                struct mips64_watch_regs mips64;
+        };
+};
+#define PTRACE_GET_WATCH_REGS   0xd0
+#define PTRACE_SET_WATCH_REGS   0xd1
+#endif /* _UAPI_ASM_PTRACE_H */
diff --git a/arch/mips/include/asm/resource.h b/arch/mips/include/uapi/asm/resource.h
index 87cb3085269..87cb3085269 100644
--- a/arch/mips/include/asm/resource.h
+++ b/arch/mips/include/uapi/asm/resource.h
diff --git a/arch/mips/include/asm/sembuf.h b/arch/mips/include/uapi/asm/sembuf.h
index 7281a4decaa..7281a4decaa 100644
--- a/arch/mips/include/asm/sembuf.h
+++ b/arch/mips/include/uapi/asm/sembuf.h
diff --git a/arch/mips/include/uapi/asm/setup.h b/arch/mips/include/uapi/asm/setup.h
new file mode 100644
index 00000000000..93f237bb135
--- /dev/null
+++ b/arch/mips/include/uapi/asm/setup.h
@@ -0,0 +1,7 @@
+#ifndef _UAPI_MIPS_SETUP_H
+#define _UAPI_MIPS_SETUP_H
+#define COMMAND_LINE_SIZE       4096
+#endif /* _UAPI_MIPS_SETUP_H */
diff --git a/arch/mips/include/asm/sgidefs.h b/arch/mips/include/uapi/asm/sgidefs.h
index 876442fcfb3..876442fcfb3 100644
--- a/arch/mips/include/asm/sgidefs.h
+++ b/arch/mips/include/uapi/asm/sgidefs.h
diff --git a/arch/mips/include/asm/shmbuf.h b/arch/mips/include/uapi/asm/shmbuf.h
index f994438277b..f994438277b 100644
--- a/arch/mips/include/asm/shmbuf.h
+++ b/arch/mips/include/uapi/asm/shmbuf.h
diff --git a/arch/mips/include/uapi/asm/sigcontext.h b/arch/mips/include/uapi/asm/sigcontext.h
new file mode 100644
index 00000000000..6c9906f59c6
--- /dev/null
+++ b/arch/mips/include/uapi/asm/sigcontext.h
@@ -0,0 +1,78 @@
+/*
+ * 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) 1996, 1997, 1999 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SIGCONTEXT_H
+#define _UAPI_ASM_SIGCONTEXT_H
+#include <linux/types.h>
+#include <asm/sgidefs.h>
+#if _MIPS_SIM == _MIPS_SIM_ABI32
+/*
+ * Keep this struct definition in sync with the sigcontext fragment
+ * in arch/mips/tools/offset.c
+ */
+struct sigcontext {
+        unsigned int            sc_regmask;     /* Unused */
+        unsigned int            sc_status;      /* Unused */
+        unsigned long long      sc_pc;
+        unsigned long long      sc_regs[32];
+        unsigned long long      sc_fpregs[32];
+        unsigned int            sc_acx;         /* Was sc_ownedfp */
+        unsigned int            sc_fpc_csr;
+        unsigned int            sc_fpc_eir;     /* Unused */
+        unsigned int            sc_used_math;
+        unsigned int            sc_dsp;         /* dsp status, was sc_ssflags */
+        unsigned long long      sc_mdhi;
+        unsigned long long      sc_mdlo;
+        unsigned long           sc_hi1;         /* Was sc_cause */
+        unsigned long           sc_lo1;         /* Was sc_badvaddr */
+        unsigned long           sc_hi2;         /* Was sc_sigset[4] */
+        unsigned long           sc_lo2;
+        unsigned long           sc_hi3;
+        unsigned long           sc_lo3;
+};
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
+#if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
+#include <linux/posix_types.h>
+/*
+ * Keep this struct definition in sync with the sigcontext fragment
+ * in arch/mips/tools/offset.c
+ *
+ * Warning: this structure illdefined with sc_badvaddr being just an unsigned
+ * int so it was changed to unsigned long in 2.6.0-test1.  This may break
+ * binary compatibility - no prisoners.
+ * DSP ASE in 2.6.12-rc4.  Turn sc_mdhi and sc_mdlo into an array of four
+ * entries, add sc_dsp and sc_reserved for padding.  No prisoners.
+ */
+struct sigcontext {
+        __u64   sc_regs[32];
+        __u64   sc_fpregs[32];
+        __u64   sc_mdhi;
+        __u64   sc_hi1;
+        __u64   sc_hi2;
+        __u64   sc_hi3;
+        __u64   sc_mdlo;
+        __u64   sc_lo1;
+        __u64   sc_lo2;
+        __u64   sc_lo3;
+        __u64   sc_pc;
+        __u32   sc_fpc_csr;
+        __u32   sc_used_math;
+        __u32   sc_dsp;
+        __u32   sc_reserved;
+};
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
+#endif /* _UAPI_ASM_SIGCONTEXT_H */
diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
new file mode 100644
index 00000000000..73446508d84
--- /dev/null
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -0,0 +1,114 @@
+/*
+ * 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) 1998, 1999, 2001, 2003 Ralf Baechle
+ * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SIGINFO_H
+#define _UAPI_ASM_SIGINFO_H
+#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
+#undef __ARCH_SI_TRAPNO /* exception code needs to fill this ...  */
+#define HAVE_ARCH_SIGINFO_T
+/*
+ * We duplicate the generic versions - <asm-generic/siginfo.h> is just borked
+ * by design ...
+ */
+#define HAVE_ARCH_COPY_SIGINFO
+struct siginfo;
+/*
+ * Careful to keep union _sifields from shifting ...
+ */
+#ifdef CONFIG_32BIT
+#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
+#endif
+#ifdef CONFIG_64BIT
+#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
+#endif
+#include <asm-generic/siginfo.h>
+typedef struct siginfo {
+        int si_signo;
+        int si_code;
+        int si_errno;
+        int __pad0[SI_MAX_SIZE / sizeof(int) - SI_PAD_SIZE - 3];
+        union {
+                int _pad[SI_PAD_SIZE];
+                /* kill() */
+                struct {
+                        pid_t _pid;             /* sender's pid */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                } _kill;
+                /* POSIX.1b timers */
+                struct {
+                        timer_t _tid;           /* timer id */
+                        int _overrun;           /* overrun count */
+                        char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
+                        sigval_t _sigval;       /* same as below */
+                        int _sys_private;       /* not to be passed to user */
+                } _timer;
+                /* POSIX.1b signals */
+                struct {
+                        pid_t _pid;             /* sender's pid */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                        sigval_t _sigval;
+                } _rt;
+                /* SIGCHLD */
+                struct {
+                        pid_t _pid;             /* which child */
+                        __ARCH_SI_UID_T _uid;   /* sender's uid */
+                        int _status;            /* exit code */
+                        clock_t _utime;
+                        clock_t _stime;
+                } _sigchld;
+                /* IRIX SIGCHLD */
+                struct {
+                        pid_t _pid;             /* which child */
+                        clock_t _utime;
+                        int _status;            /* exit code */
+                        clock_t _stime;
+                } _irix_sigchld;
+                /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+                struct {
+                        void __user *_addr; /* faulting insn/memory ref. */
+#ifdef __ARCH_SI_TRAPNO
+                        int _trapno;    /* TRAP # which caused the signal */
+#endif
+                        short _addr_lsb;
+                } _sigfault;
+                /* SIGPOLL, SIGXFSZ (To do ...)  */
+                struct {
+                        __ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
+                        int _fd;
+                } _sigpoll;
+        } _sifields;
+} siginfo_t;
+/*
+ * si_code values
+ * Again these have been chosen to be IRIX compatible.
+ */
+#undef SI_ASYNCIO
+#undef SI_TIMER
+#undef SI_MESGQ
+#define SI_ASYNCIO      -2      /* sent by AIO completion */
+#define SI_TIMER __SI_CODE(__SI_TIMER, -3) /* sent by timer expiration */
+#define SI_MESGQ __SI_CODE(__SI_MESGQ, -4) /* sent by real time mesq state change */
+#endif /* _UAPI_ASM_SIGINFO_H */
diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h
new file mode 100644
index 00000000000..3f1237c6c80
--- /dev/null
+++ b/arch/mips/include/uapi/asm/signal.h
@@ -0,0 +1,123 @@
+/*
+ * 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) 1995, 96, 97, 98, 99, 2003 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SIGNAL_H
+#define _UAPI_ASM_SIGNAL_H
+#include <linux/types.h>
+#define _NSIG           128
+#define _NSIG_BPW       (sizeof(unsigned long) * 8)
+#define _NSIG_WORDS     (_NSIG / _NSIG_BPW)
+typedef struct {
+        unsigned long sig[_NSIG_WORDS];
+} sigset_t;
+typedef unsigned long old_sigset_t;             /* at least 32 bits */
+#define SIGHUP           1      /* Hangup (POSIX).  */
+#define SIGINT           2      /* Interrupt (ANSI).  */
+#define SIGQUIT          3      /* Quit (POSIX).  */
+#define SIGILL           4      /* Illegal instruction (ANSI).  */
+#define SIGTRAP          5      /* Trace trap (POSIX).  */
+#define SIGIOT           6      /* IOT trap (4.2 BSD).  */
+#define SIGABRT          SIGIOT /* Abort (ANSI).  */
+#define SIGEMT           7
+#define SIGFPE           8      /* Floating-point exception (ANSI).  */
+#define SIGKILL          9      /* Kill, unblockable (POSIX).  */
+#define SIGBUS          10      /* BUS error (4.2 BSD).  */
+#define SIGSEGV         11      /* Segmentation violation (ANSI).  */
+#define SIGSYS          12
+#define SIGPIPE         13      /* Broken pipe (POSIX).  */
+#define SIGALRM         14      /* Alarm clock (POSIX).  */
+#define SIGTERM         15      /* Termination (ANSI).  */
+#define SIGUSR1         16      /* User-defined signal 1 (POSIX).  */
+#define SIGUSR2         17      /* User-defined signal 2 (POSIX).  */
+#define SIGCHLD         18      /* Child status has changed (POSIX).  */
+#define SIGCLD          SIGCHLD /* Same as SIGCHLD (System V).  */
+#define SIGPWR          19      /* Power failure restart (System V).  */
+#define SIGWINCH        20      /* Window size change (4.3 BSD, Sun).  */
+#define SIGURG          21      /* Urgent condition on socket (4.2 BSD).  */
+#define SIGIO           22      /* I/O now possible (4.2 BSD).  */
+#define SIGPOLL         SIGIO   /* Pollable event occurred (System V).  */
+#define SIGSTOP         23      /* Stop, unblockable (POSIX).  */
+#define SIGTSTP         24      /* Keyboard stop (POSIX).  */
+#define SIGCONT         25      /* Continue (POSIX).  */
+#define SIGTTIN         26      /* Background read from tty (POSIX).  */
+#define SIGTTOU         27      /* Background write to tty (POSIX).  */
+#define SIGVTALRM       28      /* Virtual alarm clock (4.2 BSD).  */
+#define SIGPROF         29      /* Profiling alarm clock (4.2 BSD).  */
+#define SIGXCPU         30      /* CPU limit exceeded (4.2 BSD).  */
+#define SIGXFSZ         31      /* File size limit exceeded (4.2 BSD).  */
+/* These should not be considered constants from userland.  */
+#define SIGRTMIN        32
+#define SIGRTMAX        _NSIG
+/*
+ * SA_FLAGS values:
+ *
+ * SA_ONSTACK indicates that a registered stack_t will be used.
+ * SA_RESTART flag to get restarting signals (which were the default long ago)
+ * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
+ * SA_RESETHAND clears the handler when the signal is delivered.
+ * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
+ * SA_NODEFER prevents the current signal from being masked in the handler.
+ *
+ * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
+ * Unix names RESETHAND and NODEFER respectively.
+ */
+#define SA_ONSTACK      0x08000000
+#define SA_RESETHAND    0x80000000
+#define SA_RESTART      0x10000000
+#define SA_SIGINFO      0x00000008
+#define SA_NODEFER      0x40000000
+#define SA_NOCLDWAIT    0x00010000
+#define SA_NOCLDSTOP    0x00000001
+#define SA_NOMASK       SA_NODEFER
+#define SA_ONESHOT      SA_RESETHAND
+#define SA_RESTORER     0x04000000      /* Only for o32 */
+/*
+ * sigaltstack controls
+ */
+#define SS_ONSTACK     1
+#define SS_DISABLE     2
+#define MINSIGSTKSZ    2048
+#define SIGSTKSZ       8192
+#define SIG_BLOCK       1       /* for blocking signals */
+#define SIG_UNBLOCK     2       /* for unblocking signals */
+#define SIG_SETMASK     3       /* for setting the signal mask */
+#include <asm-generic/signal-defs.h>
+struct sigaction {
+        unsigned int    sa_flags;
+        __sighandler_t  sa_handler;
+        sigset_t        sa_mask;
+};
+struct k_sigaction {
+        struct sigaction sa;
+};
+/* IRIX compatible stack_t  */
+typedef struct sigaltstack {
+        void __user *ss_sp;
+        size_t ss_size;
+        int ss_flags;
+} stack_t;
+#endif /* _UAPI_ASM_SIGNAL_H */
diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
new file mode 100644
index 00000000000..c5ed59549cb
--- /dev/null
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -0,0 +1,93 @@
+/*
+ * 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) 1997, 1999, 2000, 2001 Ralf Baechle
+ * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SOCKET_H
+#define _UAPI_ASM_SOCKET_H
+#include <asm/sockios.h>
+/*
+ * For setsockopt(2)
+ *
+ * This defines are ABI conformant as far as Linux supports these ...
+ */
+#define SOL_SOCKET      0xffff
+#define SO_DEBUG        0x0001  /* Record debugging information.  */
+#define SO_REUSEADDR    0x0004  /* Allow reuse of local addresses.  */
+#define SO_KEEPALIVE    0x0008  /* Keep connections alive and send
+                                   SIGPIPE when they die.  */
+#define SO_DONTROUTE    0x0010  /* Don't do local routing.  */
+#define SO_BROADCAST    0x0020  /* Allow transmission of
+                                   broadcast messages.  */
+#define SO_LINGER       0x0080  /* Block on close of a reliable
+                                   socket to transmit pending data.  */
+#define SO_OOBINLINE 0x0100     /* Receive out-of-band data in-band.  */
+#if 0
+To add: #define SO_REUSEPORT 0x0200     /* Allow local address and port reuse.  */
+#endif
+#define SO_TYPE         0x1008  /* Compatible name for SO_STYLE.  */
+#define SO_STYLE        SO_TYPE /* Synonym */
+#define SO_ERROR        0x1007  /* get error status and clear */
+#define SO_SNDBUF       0x1001  /* Send buffer size. */
+#define SO_RCVBUF       0x1002  /* Receive buffer. */
+#define SO_SNDLOWAT     0x1003  /* send low-water mark */
+#define SO_RCVLOWAT     0x1004  /* receive low-water mark */
+#define SO_SNDTIMEO     0x1005  /* send timeout */
+#define SO_RCVTIMEO     0x1006  /* receive timeout */
+#define SO_ACCEPTCONN   0x1009
+#define SO_PROTOCOL     0x1028  /* protocol type */
+#define SO_DOMAIN       0x1029  /* domain/socket family */
+/* linux-specific, might as well be the same as on i386 */
+#define SO_NO_CHECK     11
+#define SO_PRIORITY     12
+#define SO_BSDCOMPAT    14
+#define SO_PASSCRED     17
+#define SO_PEERCRED     18
+/* Security levels - as per NRL IPv6 - don't actually do anything */
+#define SO_SECURITY_AUTHENTICATION              22
+#define SO_SECURITY_ENCRYPTION_TRANSPORT        23
+#define SO_SECURITY_ENCRYPTION_NETWORK          24
+#define SO_BINDTODEVICE         25
+/* Socket filtering */
+#define SO_ATTACH_FILTER        26
+#define SO_DETACH_FILTER        27
+#define SO_PEERNAME             28
+#define SO_TIMESTAMP            29
+#define SCM_TIMESTAMP           SO_TIMESTAMP
+#define SO_PEERSEC              30
+#define SO_SNDBUFFORCE          31
+#define SO_RCVBUFFORCE          33
+#define SO_PASSSEC              34
+#define SO_TIMESTAMPNS          35
+#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
+#define SO_MARK                 36
+#define SO_TIMESTAMPING         37
+#define SCM_TIMESTAMPING        SO_TIMESTAMPING
+#define SO_RXQ_OVFL             40
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+#define SO_PEEK_OFF             42
+/* Instruct lower device to use last 4-bytes of skb data as FCS */
+#define SO_NOFCS                43
+#endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/mips/include/asm/sockios.h b/arch/mips/include/uapi/asm/sockios.h
index ed1a5f78d22..ed1a5f78d22 100644
--- a/arch/mips/include/asm/sockios.h
+++ b/arch/mips/include/uapi/asm/sockios.h
diff --git a/arch/mips/include/asm/stat.h b/arch/mips/include/uapi/asm/stat.h
index fe9a4c3ec5a..fe9a4c3ec5a 100644
--- a/arch/mips/include/asm/stat.h
+++ b/arch/mips/include/uapi/asm/stat.h
diff --git a/arch/mips/include/asm/statfs.h b/arch/mips/include/uapi/asm/statfs.h
index 0f805c7a42a..0f805c7a42a 100644
--- a/arch/mips/include/asm/statfs.h
+++ b/arch/mips/include/uapi/asm/statfs.h
diff --git a/arch/mips/include/asm/swab.h b/arch/mips/include/uapi/asm/swab.h
index 97c2f81b4b4..97c2f81b4b4 100644
--- a/arch/mips/include/asm/swab.h
+++ b/arch/mips/include/uapi/asm/swab.h
diff --git a/arch/mips/include/asm/sysmips.h b/arch/mips/include/uapi/asm/sysmips.h
index 4f47b7d6a5f..4f47b7d6a5f 100644
--- a/arch/mips/include/asm/sysmips.h
+++ b/arch/mips/include/uapi/asm/sysmips.h
diff --git a/arch/mips/include/asm/termbits.h b/arch/mips/include/uapi/asm/termbits.h
index 76630b396fa..76630b396fa 100644
--- a/arch/mips/include/asm/termbits.h
+++ b/arch/mips/include/uapi/asm/termbits.h
diff --git a/arch/mips/include/uapi/asm/termios.h b/arch/mips/include/uapi/asm/termios.h
new file mode 100644
index 00000000000..574fbdfb720
--- /dev/null
+++ b/arch/mips/include/uapi/asm/termios.h
@@ -0,0 +1,80 @@
+/*
+ * 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) 1995, 1996, 2000, 2001 by Ralf Baechle
+ * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_TERMIOS_H
+#define _UAPI_ASM_TERMIOS_H
+#include <linux/errno.h>
+#include <asm/termbits.h>
+#include <asm/ioctls.h>
+struct sgttyb {
+        char    sg_ispeed;
+        char    sg_ospeed;
+        char    sg_erase;
+        char    sg_kill;
+        int     sg_flags;       /* SGI special - int, not short */
+};
+struct tchars {
+        char    t_intrc;
+        char    t_quitc;
+        char    t_startc;
+        char    t_stopc;
+        char    t_eofc;
+        char    t_brkc;
+};
+struct ltchars {
+        char    t_suspc;        /* stop process signal */
+        char    t_dsuspc;       /* delayed stop process signal */
+        char    t_rprntc;       /* reprint line */
+        char    t_flushc;       /* flush output (toggles) */
+        char    t_werasc;       /* word erase */
+        char    t_lnextc;       /* literal next character */
+};
+/* TIOCGSIZE, TIOCSSIZE not defined yet.  Only needed for SunOS source
+   compatibility anyway ... */
+struct winsize {
+        unsigned short ws_row;
+        unsigned short ws_col;
+        unsigned short ws_xpixel;
+        unsigned short ws_ypixel;
+};
+#define NCC     8
+struct termio {
+        unsigned short c_iflag;         /* input mode flags */
+        unsigned short c_oflag;         /* output mode flags */
+        unsigned short c_cflag;         /* control mode flags */
+        unsigned short c_lflag;         /* local mode flags */
+        char c_line;                    /* line discipline */
+        unsigned char c_cc[NCCS];       /* control characters */
+};
+/* modem lines */
+#define TIOCM_LE        0x001           /* line enable */
+#define TIOCM_DTR       0x002           /* data terminal ready */
+#define TIOCM_RTS       0x004           /* request to send */
+#define TIOCM_ST        0x010           /* secondary transmit */
+#define TIOCM_SR        0x020           /* secondary receive */
+#define TIOCM_CTS       0x040           /* clear to send */
+#define TIOCM_CAR       0x100           /* carrier detect */
+#define TIOCM_CD        TIOCM_CAR
+#define TIOCM_RNG       0x200           /* ring */
+#define TIOCM_RI        TIOCM_RNG
+#define TIOCM_DSR       0x400           /* data set ready */
+#define TIOCM_OUT1      0x2000
+#define TIOCM_OUT2      0x4000
+#define TIOCM_LOOP      0x8000
+#endif /* _UAPI_ASM_TERMIOS_H */
diff --git a/arch/mips/include/uapi/asm/types.h b/arch/mips/include/uapi/asm/types.h
new file mode 100644
index 00000000000..7ac9d0baad8
--- /dev/null
+++ b/arch/mips/include/uapi/asm/types.h
@@ -0,0 +1,27 @@
+/*
+ * 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) 1994, 1995, 1996, 1999 by Ralf Baechle
+ * Copyright (C) 2008 Wind River Systems,
+ *   written by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_TYPES_H
+#define _UAPI_ASM_TYPES_H
+/*
+ * We don't use int-l64.h for the kernel anymore but still use it for
+ * userspace to avoid code changes.
+ */
+#ifndef __KERNEL__
+# if _MIPS_SZLONG == 64
+#  include <asm-generic/int-l64.h>
+# else
+#  include <asm-generic/int-ll64.h>
+# endif
+#endif
+#endif /* _UAPI_ASM_TYPES_H */
diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h
new file mode 100644
index 00000000000..cc98a9dcb01
--- /dev/null
+++ b/arch/mips/include/uapi/asm/unistd.h
@@ -0,0 +1,1035 @@
+/*
+ * 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) 1995, 96, 97, 98, 99, 2000 by Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+ *
+ * Changed system calls macros _syscall5 - _syscall7 to push args 5 to 7 onto
+ * the stack. Robin Farine for ACN S.A, Copyright (C) 1996 by ACN S.A
+ */
+#ifndef _UAPI_ASM_UNISTD_H
+#define _UAPI_ASM_UNISTD_H
+#include <asm/sgidefs.h>
+#if _MIPS_SIM == _MIPS_SIM_ABI32
+/*
+ * Linux o32 style syscalls are in the range from 4000 to 4999.
+ */
+#define __NR_Linux                      4000
+#define __NR_syscall                    (__NR_Linux +   0)
+#define __NR_exit                       (__NR_Linux +   1)
+#define __NR_fork                       (__NR_Linux +   2)
+#define __NR_read                       (__NR_Linux +   3)
+#define __NR_write                      (__NR_Linux +   4)
+#define __NR_open                       (__NR_Linux +   5)
+#define __NR_close                      (__NR_Linux +   6)
+#define __NR_waitpid                    (__NR_Linux +   7)
+#define __NR_creat                      (__NR_Linux +   8)
+#define __NR_link                       (__NR_Linux +   9)
+#define __NR_unlink                     (__NR_Linux +  10)
+#define __NR_execve                     (__NR_Linux +  11)
+#define __NR_chdir                      (__NR_Linux +  12)
+#define __NR_time                       (__NR_Linux +  13)
+#define __NR_mknod                      (__NR_Linux +  14)
+#define __NR_chmod                      (__NR_Linux +  15)
+#define __NR_lchown                     (__NR_Linux +  16)
+#define __NR_break                      (__NR_Linux +  17)
+#define __NR_unused18                   (__NR_Linux +  18)
+#define __NR_lseek                      (__NR_Linux +  19)
+#define __NR_getpid                     (__NR_Linux +  20)
+#define __NR_mount                      (__NR_Linux +  21)
+#define __NR_umount                     (__NR_Linux +  22)
+#define __NR_setuid                     (__NR_Linux +  23)
+#define __NR_getuid                     (__NR_Linux +  24)
+#define __NR_stime                      (__NR_Linux +  25)
+#define __NR_ptrace                     (__NR_Linux +  26)
+#define __NR_alarm                      (__NR_Linux +  27)
+#define __NR_unused28                   (__NR_Linux +  28)
+#define __NR_pause                      (__NR_Linux +  29)
+#define __NR_utime                      (__NR_Linux +  30)
+#define __NR_stty                       (__NR_Linux +  31)
+#define __NR_gtty                       (__NR_Linux +  32)
+#define __NR_access                     (__NR_Linux +  33)
+#define __NR_nice                       (__NR_Linux +  34)
+#define __NR_ftime                      (__NR_Linux +  35)
+#define __NR_sync                       (__NR_Linux +  36)
+#define __NR_kill                       (__NR_Linux +  37)
+#define __NR_rename                     (__NR_Linux +  38)
+#define __NR_mkdir                      (__NR_Linux +  39)
+#define __NR_rmdir                      (__NR_Linux +  40)
+#define __NR_dup                        (__NR_Linux +  41)
+#define __NR_pipe                       (__NR_Linux +  42)
+#define __NR_times                      (__NR_Linux +  43)
+#define __NR_prof                       (__NR_Linux +  44)
+#define __NR_brk                        (__NR_Linux +  45)
+#define __NR_setgid                     (__NR_Linux +  46)
+#define __NR_getgid                     (__NR_Linux +  47)
+#define __NR_signal                     (__NR_Linux +  48)
+#define __NR_geteuid                    (__NR_Linux +  49)
+#define __NR_getegid                    (__NR_Linux +  50)
+#define __NR_acct                       (__NR_Linux +  51)
+#define __NR_umount2                    (__NR_Linux +  52)
+#define __NR_lock                       (__NR_Linux +  53)
+#define __NR_ioctl                      (__NR_Linux +  54)
+#define __NR_fcntl                      (__NR_Linux +  55)
+#define __NR_mpx                        (__NR_Linux +  56)
+#define __NR_setpgid                    (__NR_Linux +  57)
+#define __NR_ulimit                     (__NR_Linux +  58)
+#define __NR_unused59                   (__NR_Linux +  59)
+#define __NR_umask                      (__NR_Linux +  60)
+#define __NR_chroot                     (__NR_Linux +  61)
+#define __NR_ustat                      (__NR_Linux +  62)
+#define __NR_dup2                       (__NR_Linux +  63)
+#define __NR_getppid                    (__NR_Linux +  64)
+#define __NR_getpgrp                    (__NR_Linux +  65)
+#define __NR_setsid                     (__NR_Linux +  66)
+#define __NR_sigaction                  (__NR_Linux +  67)
+#define __NR_sgetmask                   (__NR_Linux +  68)
+#define __NR_ssetmask                   (__NR_Linux +  69)
+#define __NR_setreuid                   (__NR_Linux +  70)
+#define __NR_setregid                   (__NR_Linux +  71)
+#define __NR_sigsuspend                 (__NR_Linux +  72)
+#define __NR_sigpending                 (__NR_Linux +  73)
+#define __NR_sethostname                (__NR_Linux +  74)
+#define __NR_setrlimit                  (__NR_Linux +  75)
+#define __NR_getrlimit                  (__NR_Linux +  76)
+#define __NR_getrusage                  (__NR_Linux +  77)
+#define __NR_gettimeofday               (__NR_Linux +  78)
+#define __NR_settimeofday               (__NR_Linux +  79)
+#define __NR_getgroups                  (__NR_Linux +  80)
+#define __NR_setgroups                  (__NR_Linux +  81)
+#define __NR_reserved82                 (__NR_Linux +  82)
+#define __NR_symlink                    (__NR_Linux +  83)
+#define __NR_unused84                   (__NR_Linux +  84)
+#define __NR_readlink                   (__NR_Linux +  85)
+#define __NR_uselib                     (__NR_Linux +  86)
+#define __NR_swapon                     (__NR_Linux +  87)
+#define __NR_reboot                     (__NR_Linux +  88)
+#define __NR_readdir                    (__NR_Linux +  89)
+#define __NR_mmap                       (__NR_Linux +  90)
+#define __NR_munmap                     (__NR_Linux +  91)
+#define __NR_truncate                   (__NR_Linux +  92)
+#define __NR_ftruncate                  (__NR_Linux +  93)
+#define __NR_fchmod                     (__NR_Linux +  94)
+#define __NR_fchown                     (__NR_Linux +  95)
+#define __NR_getpriority                (__NR_Linux +  96)
+#define __NR_setpriority                (__NR_Linux +  97)
+#define __NR_profil                     (__NR_Linux +  98)
+#define __NR_statfs                     (__NR_Linux +  99)
+#define __NR_fstatfs                    (__NR_Linux + 100)
+#define __NR_ioperm                     (__NR_Linux + 101)
+#define __NR_socketcall                 (__NR_Linux + 102)
+#define __NR_syslog                     (__NR_Linux + 103)
+#define __NR_setitimer                  (__NR_Linux + 104)
+#define __NR_getitimer                  (__NR_Linux + 105)
+#define __NR_stat                       (__NR_Linux + 106)
+#define __NR_lstat                      (__NR_Linux + 107)
+#define __NR_fstat                      (__NR_Linux + 108)
+#define __NR_unused109                  (__NR_Linux + 109)
+#define __NR_iopl                       (__NR_Linux + 110)
+#define __NR_vhangup                    (__NR_Linux + 111)
+#define __NR_idle                       (__NR_Linux + 112)
+#define __NR_vm86                       (__NR_Linux + 113)
+#define __NR_wait4                      (__NR_Linux + 114)
+#define __NR_swapoff                    (__NR_Linux + 115)
+#define __NR_sysinfo                    (__NR_Linux + 116)
+#define __NR_ipc                        (__NR_Linux + 117)
+#define __NR_fsync                      (__NR_Linux + 118)
+#define __NR_sigreturn                  (__NR_Linux + 119)
+#define __NR_clone                      (__NR_Linux + 120)
+#define __NR_setdomainname              (__NR_Linux + 121)
+#define __NR_uname                      (__NR_Linux + 122)
+#define __NR_modify_ldt                 (__NR_Linux + 123)
+#define __NR_adjtimex                   (__NR_Linux + 124)
+#define __NR_mprotect                   (__NR_Linux + 125)
+#define __NR_sigprocmask                (__NR_Linux + 126)
+#define __NR_create_module              (__NR_Linux + 127)
+#define __NR_init_module                (__NR_Linux + 128)
+#define __NR_delete_module              (__NR_Linux + 129)
+#define __NR_get_kernel_syms            (__NR_Linux + 130)
+#define __NR_quotactl                   (__NR_Linux + 131)
+#define __NR_getpgid                    (__NR_Linux + 132)
+#define __NR_fchdir                     (__NR_Linux + 133)
+#define __NR_bdflush                    (__NR_Linux + 134)
+#define __NR_sysfs                      (__NR_Linux + 135)
+#define __NR_personality                (__NR_Linux + 136)
+#define __NR_afs_syscall                (__NR_Linux + 137) /* Syscall for Andrew File System */
+#define __NR_setfsuid                   (__NR_Linux + 138)
+#define __NR_setfsgid                   (__NR_Linux + 139)
+#define __NR__llseek                    (__NR_Linux + 140)
+#define __NR_getdents                   (__NR_Linux + 141)
+#define __NR__newselect                 (__NR_Linux + 142)
+#define __NR_flock                      (__NR_Linux + 143)
+#define __NR_msync                      (__NR_Linux + 144)
+#define __NR_readv                      (__NR_Linux + 145)
+#define __NR_writev                     (__NR_Linux + 146)
+#define __NR_cacheflush                 (__NR_Linux + 147)
+#define __NR_cachectl                   (__NR_Linux + 148)
+#define __NR_sysmips                    (__NR_Linux + 149)
+#define __NR_unused150                  (__NR_Linux + 150)
+#define __NR_getsid                     (__NR_Linux + 151)
+#define __NR_fdatasync                  (__NR_Linux + 152)
+#define __NR__sysctl                    (__NR_Linux + 153)
+#define __NR_mlock                      (__NR_Linux + 154)
+#define __NR_munlock                    (__NR_Linux + 155)
+#define __NR_mlockall                   (__NR_Linux + 156)
+#define __NR_munlockall                 (__NR_Linux + 157)
+#define __NR_sched_setparam             (__NR_Linux + 158)
+#define __NR_sched_getparam             (__NR_Linux + 159)
+#define __NR_sched_setscheduler         (__NR_Linux + 160)
+#define __NR_sched_getscheduler         (__NR_Linux + 161)
+#define __NR_sched_yield                (__NR_Linux + 162)
+#define __NR_sched_get_priority_max     (__NR_Linux + 163)
+#define __NR_sched_get_priority_min     (__NR_Linux + 164)
+#define __NR_sched_rr_get_interval      (__NR_Linux + 165)
+#define __NR_nanosleep                  (__NR_Linux + 166)
+#define __NR_mremap                     (__NR_Linux + 167)
+#define __NR_accept                     (__NR_Linux + 168)
+#define __NR_bind                       (__NR_Linux + 169)
+#define __NR_connect                    (__NR_Linux + 170)
+#define __NR_getpeername                (__NR_Linux + 171)
+#define __NR_getsockname                (__NR_Linux + 172)
+#define __NR_getsockopt                 (__NR_Linux + 173)
+#define __NR_listen                     (__NR_Linux + 174)
+#define __NR_recv                       (__NR_Linux + 175)
+#define __NR_recvfrom                   (__NR_Linux + 176)
+#define __NR_recvmsg                    (__NR_Linux + 177)
+#define __NR_send                       (__NR_Linux + 178)
+#define __NR_sendmsg                    (__NR_Linux + 179)
+#define __NR_sendto                     (__NR_Linux + 180)
+#define __NR_setsockopt                 (__NR_Linux + 181)
+#define __NR_shutdown                   (__NR_Linux + 182)
+#define __NR_socket                     (__NR_Linux + 183)
+#define __NR_socketpair                 (__NR_Linux + 184)
+#define __NR_setresuid                  (__NR_Linux + 185)
+#define __NR_getresuid                  (__NR_Linux + 186)
+#define __NR_query_module               (__NR_Linux + 187)
+#define __NR_poll                       (__NR_Linux + 188)
+#define __NR_nfsservctl                 (__NR_Linux + 189)
+#define __NR_setresgid                  (__NR_Linux + 190)
+#define __NR_getresgid                  (__NR_Linux + 191)
+#define __NR_prctl                      (__NR_Linux + 192)
+#define __NR_rt_sigreturn               (__NR_Linux + 193)
+#define __NR_rt_sigaction               (__NR_Linux + 194)
+#define __NR_rt_sigprocmask             (__NR_Linux + 195)
+#define __NR_rt_sigpending              (__NR_Linux + 196)
+#define __NR_rt_sigtimedwait            (__NR_Linux + 197)
+#define __NR_rt_sigqueueinfo            (__NR_Linux + 198)
+#define __NR_rt_sigsuspend              (__NR_Linux + 199)
+#define __NR_pread64                    (__NR_Linux + 200)
+#define __NR_pwrite64                   (__NR_Linux + 201)
+#define __NR_chown                      (__NR_Linux + 202)
+#define __NR_getcwd                     (__NR_Linux + 203)
+#define __NR_capget                     (__NR_Linux + 204)
+#define __NR_capset                     (__NR_Linux + 205)
+#define __NR_sigaltstack                (__NR_Linux + 206)
+#define __NR_sendfile                   (__NR_Linux + 207)
+#define __NR_getpmsg                    (__NR_Linux + 208)
+#define __NR_putpmsg                    (__NR_Linux + 209)
+#define __NR_mmap2                      (__NR_Linux + 210)
+#define __NR_truncate64                 (__NR_Linux + 211)
+#define __NR_ftruncate64                (__NR_Linux + 212)
+#define __NR_stat64                     (__NR_Linux + 213)
+#define __NR_lstat64                    (__NR_Linux + 214)
+#define __NR_fstat64                    (__NR_Linux + 215)
+#define __NR_pivot_root                 (__NR_Linux + 216)
+#define __NR_mincore                    (__NR_Linux + 217)
+#define __NR_madvise                    (__NR_Linux + 218)
+#define __NR_getdents64                 (__NR_Linux + 219)
+#define __NR_fcntl64                    (__NR_Linux + 220)
+#define __NR_reserved221                (__NR_Linux + 221)
+#define __NR_gettid                     (__NR_Linux + 222)
+#define __NR_readahead                  (__NR_Linux + 223)
+#define __NR_setxattr                   (__NR_Linux + 224)
+#define __NR_lsetxattr                  (__NR_Linux + 225)
+#define __NR_fsetxattr                  (__NR_Linux + 226)
+#define __NR_getxattr                   (__NR_Linux + 227)
+#define __NR_lgetxattr                  (__NR_Linux + 228)
+#define __NR_fgetxattr                  (__NR_Linux + 229)
+#define __NR_listxattr                  (__NR_Linux + 230)
+#define __NR_llistxattr                 (__NR_Linux + 231)
+#define __NR_flistxattr                 (__NR_Linux + 232)
+#define __NR_removexattr                (__NR_Linux + 233)
+#define __NR_lremovexattr               (__NR_Linux + 234)
+#define __NR_fremovexattr               (__NR_Linux + 235)
+#define __NR_tkill                      (__NR_Linux + 236)
+#define __NR_sendfile64                 (__NR_Linux + 237)
+#define __NR_futex                      (__NR_Linux + 238)
+#define __NR_sched_setaffinity          (__NR_Linux + 239)
+#define __NR_sched_getaffinity          (__NR_Linux + 240)
+#define __NR_io_setup                   (__NR_Linux + 241)
+#define __NR_io_destroy                 (__NR_Linux + 242)
+#define __NR_io_getevents               (__NR_Linux + 243)
+#define __NR_io_submit                  (__NR_Linux + 244)
+#define __NR_io_cancel                  (__NR_Linux + 245)
+#define __NR_exit_group                 (__NR_Linux + 246)
+#define __NR_lookup_dcookie             (__NR_Linux + 247)
+#define __NR_epoll_create               (__NR_Linux + 248)
+#define __NR_epoll_ctl                  (__NR_Linux + 249)
+#define __NR_epoll_wait                 (__NR_Linux + 250)
+#define __NR_remap_file_pages           (__NR_Linux + 251)
+#define __NR_set_tid_address            (__NR_Linux + 252)
+#define __NR_restart_syscall            (__NR_Linux + 253)
+#define __NR_fadvise64                  (__NR_Linux + 254)
+#define __NR_statfs64                   (__NR_Linux + 255)
+#define __NR_fstatfs64                  (__NR_Linux + 256)
+#define __NR_timer_create               (__NR_Linux + 257)
+#define __NR_timer_settime              (__NR_Linux + 258)
+#define __NR_timer_gettime              (__NR_Linux + 259)
+#define __NR_timer_getoverrun           (__NR_Linux + 260)
+#define __NR_timer_delete               (__NR_Linux + 261)
+#define __NR_clock_settime              (__NR_Linux + 262)
+#define __NR_clock_gettime              (__NR_Linux + 263)
+#define __NR_clock_getres               (__NR_Linux + 264)
+#define __NR_clock_nanosleep            (__NR_Linux + 265)
+#define __NR_tgkill                     (__NR_Linux + 266)
+#define __NR_utimes                     (__NR_Linux + 267)
+#define __NR_mbind                      (__NR_Linux + 268)
+#define __NR_get_mempolicy              (__NR_Linux + 269)
+#define __NR_set_mempolicy              (__NR_Linux + 270)
+#define __NR_mq_open                    (__NR_Linux + 271)
+#define __NR_mq_unlink                  (__NR_Linux + 272)
+#define __NR_mq_timedsend               (__NR_Linux + 273)
+#define __NR_mq_timedreceive            (__NR_Linux + 274)
+#define __NR_mq_notify                  (__NR_Linux + 275)
+#define __NR_mq_getsetattr              (__NR_Linux + 276)
+#define __NR_vserver                    (__NR_Linux + 277)
+#define __NR_waitid                     (__NR_Linux + 278)
+/* #define __NR_sys_setaltroot          (__NR_Linux + 279) */
+#define __NR_add_key                    (__NR_Linux + 280)
+#define __NR_request_key                (__NR_Linux + 281)
+#define __NR_keyctl                     (__NR_Linux + 282)
+#define __NR_set_thread_area            (__NR_Linux + 283)
+#define __NR_inotify_init               (__NR_Linux + 284)
+#define __NR_inotify_add_watch          (__NR_Linux + 285)
+#define __NR_inotify_rm_watch           (__NR_Linux + 286)
+#define __NR_migrate_pages              (__NR_Linux + 287)
+#define __NR_openat                     (__NR_Linux + 288)
+#define __NR_mkdirat                    (__NR_Linux + 289)
+#define __NR_mknodat                    (__NR_Linux + 290)
+#define __NR_fchownat                   (__NR_Linux + 291)
+#define __NR_futimesat                  (__NR_Linux + 292)
+#define __NR_fstatat64                  (__NR_Linux + 293)
+#define __NR_unlinkat                   (__NR_Linux + 294)
+#define __NR_renameat                   (__NR_Linux + 295)
+#define __NR_linkat                     (__NR_Linux + 296)
+#define __NR_symlinkat                  (__NR_Linux + 297)
+#define __NR_readlinkat                 (__NR_Linux + 298)
+#define __NR_fchmodat                   (__NR_Linux + 299)
+#define __NR_faccessat                  (__NR_Linux + 300)
+#define __NR_pselect6                   (__NR_Linux + 301)
+#define __NR_ppoll                      (__NR_Linux + 302)
+#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)
+#define __NR_set_robust_list            (__NR_Linux + 309)
+#define __NR_get_robust_list            (__NR_Linux + 310)
+#define __NR_kexec_load                 (__NR_Linux + 311)
+#define __NR_getcpu                     (__NR_Linux + 312)
+#define __NR_epoll_pwait                (__NR_Linux + 313)
+#define __NR_ioprio_set                 (__NR_Linux + 314)
+#define __NR_ioprio_get                 (__NR_Linux + 315)
+#define __NR_utimensat                  (__NR_Linux + 316)
+#define __NR_signalfd                   (__NR_Linux + 317)
+#define __NR_timerfd                    (__NR_Linux + 318)
+#define __NR_eventfd                    (__NR_Linux + 319)
+#define __NR_fallocate                  (__NR_Linux + 320)
+#define __NR_timerfd_create             (__NR_Linux + 321)
+#define __NR_timerfd_gettime            (__NR_Linux + 322)
+#define __NR_timerfd_settime            (__NR_Linux + 323)
+#define __NR_signalfd4                  (__NR_Linux + 324)
+#define __NR_eventfd2                   (__NR_Linux + 325)
+#define __NR_epoll_create1              (__NR_Linux + 326)
+#define __NR_dup3                       (__NR_Linux + 327)
+#define __NR_pipe2                      (__NR_Linux + 328)
+#define __NR_inotify_init1              (__NR_Linux + 329)
+#define __NR_preadv                     (__NR_Linux + 330)
+#define __NR_pwritev                    (__NR_Linux + 331)
+#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 332)
+#define __NR_perf_event_open            (__NR_Linux + 333)
+#define __NR_accept4                    (__NR_Linux + 334)
+#define __NR_recvmmsg                   (__NR_Linux + 335)
+#define __NR_fanotify_init              (__NR_Linux + 336)
+#define __NR_fanotify_mark              (__NR_Linux + 337)
+#define __NR_prlimit64                  (__NR_Linux + 338)
+#define __NR_name_to_handle_at          (__NR_Linux + 339)
+#define __NR_open_by_handle_at          (__NR_Linux + 340)
+#define __NR_clock_adjtime              (__NR_Linux + 341)
+#define __NR_syncfs                     (__NR_Linux + 342)
+#define __NR_sendmmsg                   (__NR_Linux + 343)
+#define __NR_setns                      (__NR_Linux + 344)
+#define __NR_process_vm_readv           (__NR_Linux + 345)
+#define __NR_process_vm_writev          (__NR_Linux + 346)
+#define __NR_kcmp                       (__NR_Linux + 347)
+/*
+ * Offset of the last Linux o32 flavoured syscall
+ */
+#define __NR_Linux_syscalls             347
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
+#define __NR_O32_Linux                  4000
+#define __NR_O32_Linux_syscalls         347
+#if _MIPS_SIM == _MIPS_SIM_ABI64
+/*
+ * Linux 64-bit syscalls are in the range from 5000 to 5999.
+ */
+#define __NR_Linux                      5000
+#define __NR_read                       (__NR_Linux +   0)
+#define __NR_write                      (__NR_Linux +   1)
+#define __NR_open                       (__NR_Linux +   2)
+#define __NR_close                      (__NR_Linux +   3)
+#define __NR_stat                       (__NR_Linux +   4)
+#define __NR_fstat                      (__NR_Linux +   5)
+#define __NR_lstat                      (__NR_Linux +   6)
+#define __NR_poll                       (__NR_Linux +   7)
+#define __NR_lseek                      (__NR_Linux +   8)
+#define __NR_mmap                       (__NR_Linux +   9)
+#define __NR_mprotect                   (__NR_Linux +  10)
+#define __NR_munmap                     (__NR_Linux +  11)
+#define __NR_brk                        (__NR_Linux +  12)
+#define __NR_rt_sigaction               (__NR_Linux +  13)
+#define __NR_rt_sigprocmask             (__NR_Linux +  14)
+#define __NR_ioctl                      (__NR_Linux +  15)
+#define __NR_pread64                    (__NR_Linux +  16)
+#define __NR_pwrite64                   (__NR_Linux +  17)
+#define __NR_readv                      (__NR_Linux +  18)
+#define __NR_writev                     (__NR_Linux +  19)
+#define __NR_access                     (__NR_Linux +  20)
+#define __NR_pipe                       (__NR_Linux +  21)
+#define __NR__newselect                 (__NR_Linux +  22)
+#define __NR_sched_yield                (__NR_Linux +  23)
+#define __NR_mremap                     (__NR_Linux +  24)
+#define __NR_msync                      (__NR_Linux +  25)
+#define __NR_mincore                    (__NR_Linux +  26)
+#define __NR_madvise                    (__NR_Linux +  27)
+#define __NR_shmget                     (__NR_Linux +  28)
+#define __NR_shmat                      (__NR_Linux +  29)
+#define __NR_shmctl                     (__NR_Linux +  30)
+#define __NR_dup                        (__NR_Linux +  31)
+#define __NR_dup2                       (__NR_Linux +  32)
+#define __NR_pause                      (__NR_Linux +  33)
+#define __NR_nanosleep                  (__NR_Linux +  34)
+#define __NR_getitimer                  (__NR_Linux +  35)
+#define __NR_setitimer                  (__NR_Linux +  36)
+#define __NR_alarm                      (__NR_Linux +  37)
+#define __NR_getpid                     (__NR_Linux +  38)
+#define __NR_sendfile                   (__NR_Linux +  39)
+#define __NR_socket                     (__NR_Linux +  40)
+#define __NR_connect                    (__NR_Linux +  41)
+#define __NR_accept                     (__NR_Linux +  42)
+#define __NR_sendto                     (__NR_Linux +  43)
+#define __NR_recvfrom                   (__NR_Linux +  44)
+#define __NR_sendmsg                    (__NR_Linux +  45)
+#define __NR_recvmsg                    (__NR_Linux +  46)
+#define __NR_shutdown                   (__NR_Linux +  47)
+#define __NR_bind                       (__NR_Linux +  48)
+#define __NR_listen                     (__NR_Linux +  49)
+#define __NR_getsockname                (__NR_Linux +  50)
+#define __NR_getpeername                (__NR_Linux +  51)
+#define __NR_socketpair                 (__NR_Linux +  52)
+#define __NR_setsockopt                 (__NR_Linux +  53)
+#define __NR_getsockopt                 (__NR_Linux +  54)
+#define __NR_clone                      (__NR_Linux +  55)
+#define __NR_fork                       (__NR_Linux +  56)
+#define __NR_execve                     (__NR_Linux +  57)
+#define __NR_exit                       (__NR_Linux +  58)
+#define __NR_wait4                      (__NR_Linux +  59)
+#define __NR_kill                       (__NR_Linux +  60)
+#define __NR_uname                      (__NR_Linux +  61)
+#define __NR_semget                     (__NR_Linux +  62)
+#define __NR_semop                      (__NR_Linux +  63)
+#define __NR_semctl                     (__NR_Linux +  64)
+#define __NR_shmdt                      (__NR_Linux +  65)
+#define __NR_msgget                     (__NR_Linux +  66)
+#define __NR_msgsnd                     (__NR_Linux +  67)
+#define __NR_msgrcv                     (__NR_Linux +  68)
+#define __NR_msgctl                     (__NR_Linux +  69)
+#define __NR_fcntl                      (__NR_Linux +  70)
+#define __NR_flock                      (__NR_Linux +  71)
+#define __NR_fsync                      (__NR_Linux +  72)
+#define __NR_fdatasync                  (__NR_Linux +  73)
+#define __NR_truncate                   (__NR_Linux +  74)
+#define __NR_ftruncate                  (__NR_Linux +  75)
+#define __NR_getdents                   (__NR_Linux +  76)
+#define __NR_getcwd                     (__NR_Linux +  77)
+#define __NR_chdir                      (__NR_Linux +  78)
+#define __NR_fchdir                     (__NR_Linux +  79)
+#define __NR_rename                     (__NR_Linux +  80)
+#define __NR_mkdir                      (__NR_Linux +  81)
+#define __NR_rmdir                      (__NR_Linux +  82)
+#define __NR_creat                      (__NR_Linux +  83)
+#define __NR_link                       (__NR_Linux +  84)
+#define __NR_unlink                     (__NR_Linux +  85)
+#define __NR_symlink                    (__NR_Linux +  86)
+#define __NR_readlink                   (__NR_Linux +  87)
+#define __NR_chmod                      (__NR_Linux +  88)
+#define __NR_fchmod                     (__NR_Linux +  89)
+#define __NR_chown                      (__NR_Linux +  90)
+#define __NR_fchown                     (__NR_Linux +  91)
+#define __NR_lchown                     (__NR_Linux +  92)
+#define __NR_umask                      (__NR_Linux +  93)
+#define __NR_gettimeofday               (__NR_Linux +  94)
+#define __NR_getrlimit                  (__NR_Linux +  95)
+#define __NR_getrusage                  (__NR_Linux +  96)
+#define __NR_sysinfo                    (__NR_Linux +  97)
+#define __NR_times                      (__NR_Linux +  98)
+#define __NR_ptrace                     (__NR_Linux +  99)
+#define __NR_getuid                     (__NR_Linux + 100)
+#define __NR_syslog                     (__NR_Linux + 101)
+#define __NR_getgid                     (__NR_Linux + 102)
+#define __NR_setuid                     (__NR_Linux + 103)
+#define __NR_setgid                     (__NR_Linux + 104)
+#define __NR_geteuid                    (__NR_Linux + 105)
+#define __NR_getegid                    (__NR_Linux + 106)
+#define __NR_setpgid                    (__NR_Linux + 107)
+#define __NR_getppid                    (__NR_Linux + 108)
+#define __NR_getpgrp                    (__NR_Linux + 109)
+#define __NR_setsid                     (__NR_Linux + 110)
+#define __NR_setreuid                   (__NR_Linux + 111)
+#define __NR_setregid                   (__NR_Linux + 112)
+#define __NR_getgroups                  (__NR_Linux + 113)
+#define __NR_setgroups                  (__NR_Linux + 114)
+#define __NR_setresuid                  (__NR_Linux + 115)
+#define __NR_getresuid                  (__NR_Linux + 116)
+#define __NR_setresgid                  (__NR_Linux + 117)
+#define __NR_getresgid                  (__NR_Linux + 118)
+#define __NR_getpgid                    (__NR_Linux + 119)
+#define __NR_setfsuid                   (__NR_Linux + 120)
+#define __NR_setfsgid                   (__NR_Linux + 121)
+#define __NR_getsid                     (__NR_Linux + 122)
+#define __NR_capget                     (__NR_Linux + 123)
+#define __NR_capset                     (__NR_Linux + 124)
+#define __NR_rt_sigpending              (__NR_Linux + 125)
+#define __NR_rt_sigtimedwait            (__NR_Linux + 126)
+#define __NR_rt_sigqueueinfo            (__NR_Linux + 127)
+#define __NR_rt_sigsuspend              (__NR_Linux + 128)
+#define __NR_sigaltstack                (__NR_Linux + 129)
+#define __NR_utime                      (__NR_Linux + 130)
+#define __NR_mknod                      (__NR_Linux + 131)
+#define __NR_personality                (__NR_Linux + 132)
+#define __NR_ustat                      (__NR_Linux + 133)
+#define __NR_statfs                     (__NR_Linux + 134)
+#define __NR_fstatfs                    (__NR_Linux + 135)
+#define __NR_sysfs                      (__NR_Linux + 136)
+#define __NR_getpriority                (__NR_Linux + 137)
+#define __NR_setpriority                (__NR_Linux + 138)
+#define __NR_sched_setparam             (__NR_Linux + 139)
+#define __NR_sched_getparam             (__NR_Linux + 140)
+#define __NR_sched_setscheduler         (__NR_Linux + 141)
+#define __NR_sched_getscheduler         (__NR_Linux + 142)
+#define __NR_sched_get_priority_max     (__NR_Linux + 143)
+#define __NR_sched_get_priority_min     (__NR_Linux + 144)
+#define __NR_sched_rr_get_interval      (__NR_Linux + 145)
+#define __NR_mlock                      (__NR_Linux + 146)
+#define __NR_munlock                    (__NR_Linux + 147)
+#define __NR_mlockall                   (__NR_Linux + 148)
+#define __NR_munlockall                 (__NR_Linux + 149)
+#define __NR_vhangup                    (__NR_Linux + 150)
+#define __NR_pivot_root                 (__NR_Linux + 151)
+#define __NR__sysctl                    (__NR_Linux + 152)
+#define __NR_prctl                      (__NR_Linux + 153)
+#define __NR_adjtimex                   (__NR_Linux + 154)
+#define __NR_setrlimit                  (__NR_Linux + 155)
+#define __NR_chroot                     (__NR_Linux + 156)
+#define __NR_sync                       (__NR_Linux + 157)
+#define __NR_acct                       (__NR_Linux + 158)
+#define __NR_settimeofday               (__NR_Linux + 159)
+#define __NR_mount                      (__NR_Linux + 160)
+#define __NR_umount2                    (__NR_Linux + 161)
+#define __NR_swapon                     (__NR_Linux + 162)
+#define __NR_swapoff                    (__NR_Linux + 163)
+#define __NR_reboot                     (__NR_Linux + 164)
+#define __NR_sethostname                (__NR_Linux + 165)
+#define __NR_setdomainname              (__NR_Linux + 166)
+#define __NR_create_module              (__NR_Linux + 167)
+#define __NR_init_module                (__NR_Linux + 168)
+#define __NR_delete_module              (__NR_Linux + 169)
+#define __NR_get_kernel_syms            (__NR_Linux + 170)
+#define __NR_query_module               (__NR_Linux + 171)
+#define __NR_quotactl                   (__NR_Linux + 172)
+#define __NR_nfsservctl                 (__NR_Linux + 173)
+#define __NR_getpmsg                    (__NR_Linux + 174)
+#define __NR_putpmsg                    (__NR_Linux + 175)
+#define __NR_afs_syscall                (__NR_Linux + 176)
+#define __NR_reserved177                (__NR_Linux + 177)
+#define __NR_gettid                     (__NR_Linux + 178)
+#define __NR_readahead                  (__NR_Linux + 179)
+#define __NR_setxattr                   (__NR_Linux + 180)
+#define __NR_lsetxattr                  (__NR_Linux + 181)
+#define __NR_fsetxattr                  (__NR_Linux + 182)
+#define __NR_getxattr                   (__NR_Linux + 183)
+#define __NR_lgetxattr                  (__NR_Linux + 184)
+#define __NR_fgetxattr                  (__NR_Linux + 185)
+#define __NR_listxattr                  (__NR_Linux + 186)
+#define __NR_llistxattr                 (__NR_Linux + 187)
+#define __NR_flistxattr                 (__NR_Linux + 188)
+#define __NR_removexattr                (__NR_Linux + 189)
+#define __NR_lremovexattr               (__NR_Linux + 190)
+#define __NR_fremovexattr               (__NR_Linux + 191)
+#define __NR_tkill                      (__NR_Linux + 192)
+#define __NR_reserved193                (__NR_Linux + 193)
+#define __NR_futex                      (__NR_Linux + 194)
+#define __NR_sched_setaffinity          (__NR_Linux + 195)
+#define __NR_sched_getaffinity          (__NR_Linux + 196)
+#define __NR_cacheflush                 (__NR_Linux + 197)
+#define __NR_cachectl                   (__NR_Linux + 198)
+#define __NR_sysmips                    (__NR_Linux + 199)
+#define __NR_io_setup                   (__NR_Linux + 200)
+#define __NR_io_destroy                 (__NR_Linux + 201)
+#define __NR_io_getevents               (__NR_Linux + 202)
+#define __NR_io_submit                  (__NR_Linux + 203)
+#define __NR_io_cancel                  (__NR_Linux + 204)
+#define __NR_exit_group                 (__NR_Linux + 205)
+#define __NR_lookup_dcookie             (__NR_Linux + 206)
+#define __NR_epoll_create               (__NR_Linux + 207)
+#define __NR_epoll_ctl                  (__NR_Linux + 208)
+#define __NR_epoll_wait                 (__NR_Linux + 209)
+#define __NR_remap_file_pages           (__NR_Linux + 210)
+#define __NR_rt_sigreturn               (__NR_Linux + 211)
+#define __NR_set_tid_address            (__NR_Linux + 212)
+#define __NR_restart_syscall            (__NR_Linux + 213)
+#define __NR_semtimedop                 (__NR_Linux + 214)
+#define __NR_fadvise64                  (__NR_Linux + 215)
+#define __NR_timer_create               (__NR_Linux + 216)
+#define __NR_timer_settime              (__NR_Linux + 217)
+#define __NR_timer_gettime              (__NR_Linux + 218)
+#define __NR_timer_getoverrun           (__NR_Linux + 219)
+#define __NR_timer_delete               (__NR_Linux + 220)
+#define __NR_clock_settime              (__NR_Linux + 221)
+#define __NR_clock_gettime              (__NR_Linux + 222)
+#define __NR_clock_getres               (__NR_Linux + 223)
+#define __NR_clock_nanosleep            (__NR_Linux + 224)
+#define __NR_tgkill                     (__NR_Linux + 225)
+#define __NR_utimes                     (__NR_Linux + 226)
+#define __NR_mbind                      (__NR_Linux + 227)
+#define __NR_get_mempolicy              (__NR_Linux + 228)
+#define __NR_set_mempolicy              (__NR_Linux + 229)
+#define __NR_mq_open                    (__NR_Linux + 230)
+#define __NR_mq_unlink                  (__NR_Linux + 231)
+#define __NR_mq_timedsend               (__NR_Linux + 232)
+#define __NR_mq_timedreceive            (__NR_Linux + 233)
+#define __NR_mq_notify                  (__NR_Linux + 234)
+#define __NR_mq_getsetattr              (__NR_Linux + 235)
+#define __NR_vserver                    (__NR_Linux + 236)
+#define __NR_waitid                     (__NR_Linux + 237)
+/* #define __NR_sys_setaltroot          (__NR_Linux + 238) */
+#define __NR_add_key                    (__NR_Linux + 239)
+#define __NR_request_key                (__NR_Linux + 240)
+#define __NR_keyctl                     (__NR_Linux + 241)
+#define __NR_set_thread_area            (__NR_Linux + 242)
+#define __NR_inotify_init               (__NR_Linux + 243)
+#define __NR_inotify_add_watch          (__NR_Linux + 244)
+#define __NR_inotify_rm_watch           (__NR_Linux + 245)
+#define __NR_migrate_pages              (__NR_Linux + 246)
+#define __NR_openat                     (__NR_Linux + 247)
+#define __NR_mkdirat                    (__NR_Linux + 248)
+#define __NR_mknodat                    (__NR_Linux + 249)
+#define __NR_fchownat                   (__NR_Linux + 250)
+#define __NR_futimesat                  (__NR_Linux + 251)
+#define __NR_newfstatat                 (__NR_Linux + 252)
+#define __NR_unlinkat                   (__NR_Linux + 253)
+#define __NR_renameat                   (__NR_Linux + 254)
+#define __NR_linkat                     (__NR_Linux + 255)
+#define __NR_symlinkat                  (__NR_Linux + 256)
+#define __NR_readlinkat                 (__NR_Linux + 257)
+#define __NR_fchmodat                   (__NR_Linux + 258)
+#define __NR_faccessat                  (__NR_Linux + 259)
+#define __NR_pselect6                   (__NR_Linux + 260)
+#define __NR_ppoll                      (__NR_Linux + 261)
+#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)
+#define __NR_set_robust_list            (__NR_Linux + 268)
+#define __NR_get_robust_list            (__NR_Linux + 269)
+#define __NR_kexec_load                 (__NR_Linux + 270)
+#define __NR_getcpu                     (__NR_Linux + 271)
+#define __NR_epoll_pwait                (__NR_Linux + 272)
+#define __NR_ioprio_set                 (__NR_Linux + 273)
+#define __NR_ioprio_get                 (__NR_Linux + 274)
+#define __NR_utimensat                  (__NR_Linux + 275)
+#define __NR_signalfd                   (__NR_Linux + 276)
+#define __NR_timerfd                    (__NR_Linux + 277)
+#define __NR_eventfd                    (__NR_Linux + 278)
+#define __NR_fallocate                  (__NR_Linux + 279)
+#define __NR_timerfd_create             (__NR_Linux + 280)
+#define __NR_timerfd_gettime            (__NR_Linux + 281)
+#define __NR_timerfd_settime            (__NR_Linux + 282)
+#define __NR_signalfd4                  (__NR_Linux + 283)
+#define __NR_eventfd2                   (__NR_Linux + 284)
+#define __NR_epoll_create1              (__NR_Linux + 285)
+#define __NR_dup3                       (__NR_Linux + 286)
+#define __NR_pipe2                      (__NR_Linux + 287)
+#define __NR_inotify_init1              (__NR_Linux + 288)
+#define __NR_preadv                     (__NR_Linux + 289)
+#define __NR_pwritev                    (__NR_Linux + 290)
+#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 291)
+#define __NR_perf_event_open            (__NR_Linux + 292)
+#define __NR_accept4                    (__NR_Linux + 293)
+#define __NR_recvmmsg                   (__NR_Linux + 294)
+#define __NR_fanotify_init              (__NR_Linux + 295)
+#define __NR_fanotify_mark              (__NR_Linux + 296)
+#define __NR_prlimit64                  (__NR_Linux + 297)
+#define __NR_name_to_handle_at          (__NR_Linux + 298)
+#define __NR_open_by_handle_at          (__NR_Linux + 299)
+#define __NR_clock_adjtime              (__NR_Linux + 300)
+#define __NR_syncfs                     (__NR_Linux + 301)
+#define __NR_sendmmsg                   (__NR_Linux + 302)
+#define __NR_setns                      (__NR_Linux + 303)
+#define __NR_process_vm_readv           (__NR_Linux + 304)
+#define __NR_process_vm_writev          (__NR_Linux + 305)
+#define __NR_kcmp                       (__NR_Linux + 306)
+/*
+ * Offset of the last Linux 64-bit flavoured syscall
+ */
+#define __NR_Linux_syscalls             306
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
+#define __NR_64_Linux                   5000
+#define __NR_64_Linux_syscalls          306
+#if _MIPS_SIM == _MIPS_SIM_NABI32
+/*
+ * Linux N32 syscalls are in the range from 6000 to 6999.
+ */
+#define __NR_Linux                      6000
+#define __NR_read                       (__NR_Linux +   0)
+#define __NR_write                      (__NR_Linux +   1)
+#define __NR_open                       (__NR_Linux +   2)
+#define __NR_close                      (__NR_Linux +   3)
+#define __NR_stat                       (__NR_Linux +   4)
+#define __NR_fstat                      (__NR_Linux +   5)
+#define __NR_lstat                      (__NR_Linux +   6)
+#define __NR_poll                       (__NR_Linux +   7)
+#define __NR_lseek                      (__NR_Linux +   8)
+#define __NR_mmap                       (__NR_Linux +   9)
+#define __NR_mprotect                   (__NR_Linux +  10)
+#define __NR_munmap                     (__NR_Linux +  11)
+#define __NR_brk                        (__NR_Linux +  12)
+#define __NR_rt_sigaction               (__NR_Linux +  13)
+#define __NR_rt_sigprocmask             (__NR_Linux +  14)
+#define __NR_ioctl                      (__NR_Linux +  15)
+#define __NR_pread64                    (__NR_Linux +  16)
+#define __NR_pwrite64                   (__NR_Linux +  17)
+#define __NR_readv                      (__NR_Linux +  18)
+#define __NR_writev                     (__NR_Linux +  19)
+#define __NR_access                     (__NR_Linux +  20)
+#define __NR_pipe                       (__NR_Linux +  21)
+#define __NR__newselect                 (__NR_Linux +  22)
+#define __NR_sched_yield                (__NR_Linux +  23)
+#define __NR_mremap                     (__NR_Linux +  24)
+#define __NR_msync                      (__NR_Linux +  25)
+#define __NR_mincore                    (__NR_Linux +  26)
+#define __NR_madvise                    (__NR_Linux +  27)
+#define __NR_shmget                     (__NR_Linux +  28)
+#define __NR_shmat                      (__NR_Linux +  29)
+#define __NR_shmctl                     (__NR_Linux +  30)
+#define __NR_dup                        (__NR_Linux +  31)
+#define __NR_dup2                       (__NR_Linux +  32)
+#define __NR_pause                      (__NR_Linux +  33)
+#define __NR_nanosleep                  (__NR_Linux +  34)
+#define __NR_getitimer                  (__NR_Linux +  35)
+#define __NR_setitimer                  (__NR_Linux +  36)
+#define __NR_alarm                      (__NR_Linux +  37)
+#define __NR_getpid                     (__NR_Linux +  38)
+#define __NR_sendfile                   (__NR_Linux +  39)
+#define __NR_socket                     (__NR_Linux +  40)
+#define __NR_connect                    (__NR_Linux +  41)
+#define __NR_accept                     (__NR_Linux +  42)
+#define __NR_sendto                     (__NR_Linux +  43)
+#define __NR_recvfrom                   (__NR_Linux +  44)
+#define __NR_sendmsg                    (__NR_Linux +  45)
+#define __NR_recvmsg                    (__NR_Linux +  46)
+#define __NR_shutdown                   (__NR_Linux +  47)
+#define __NR_bind                       (__NR_Linux +  48)
+#define __NR_listen                     (__NR_Linux +  49)
+#define __NR_getsockname                (__NR_Linux +  50)
+#define __NR_getpeername                (__NR_Linux +  51)
+#define __NR_socketpair                 (__NR_Linux +  52)
+#define __NR_setsockopt                 (__NR_Linux +  53)
+#define __NR_getsockopt                 (__NR_Linux +  54)
+#define __NR_clone                      (__NR_Linux +  55)
+#define __NR_fork                       (__NR_Linux +  56)
+#define __NR_execve                     (__NR_Linux +  57)
+#define __NR_exit                       (__NR_Linux +  58)
+#define __NR_wait4                      (__NR_Linux +  59)
+#define __NR_kill                       (__NR_Linux +  60)
+#define __NR_uname                      (__NR_Linux +  61)
+#define __NR_semget                     (__NR_Linux +  62)
+#define __NR_semop                      (__NR_Linux +  63)
+#define __NR_semctl                     (__NR_Linux +  64)
+#define __NR_shmdt                      (__NR_Linux +  65)
+#define __NR_msgget                     (__NR_Linux +  66)
+#define __NR_msgsnd                     (__NR_Linux +  67)
+#define __NR_msgrcv                     (__NR_Linux +  68)
+#define __NR_msgctl                     (__NR_Linux +  69)
+#define __NR_fcntl                      (__NR_Linux +  70)
+#define __NR_flock                      (__NR_Linux +  71)
+#define __NR_fsync                      (__NR_Linux +  72)
+#define __NR_fdatasync                  (__NR_Linux +  73)
+#define __NR_truncate                   (__NR_Linux +  74)
+#define __NR_ftruncate                  (__NR_Linux +  75)
+#define __NR_getdents                   (__NR_Linux +  76)
+#define __NR_getcwd                     (__NR_Linux +  77)
+#define __NR_chdir                      (__NR_Linux +  78)
+#define __NR_fchdir                     (__NR_Linux +  79)
+#define __NR_rename                     (__NR_Linux +  80)
+#define __NR_mkdir                      (__NR_Linux +  81)
+#define __NR_rmdir                      (__NR_Linux +  82)
+#define __NR_creat                      (__NR_Linux +  83)
+#define __NR_link                       (__NR_Linux +  84)
+#define __NR_unlink                     (__NR_Linux +  85)
+#define __NR_symlink                    (__NR_Linux +  86)
+#define __NR_readlink                   (__NR_Linux +  87)
+#define __NR_chmod                      (__NR_Linux +  88)
+#define __NR_fchmod                     (__NR_Linux +  89)
+#define __NR_chown                      (__NR_Linux +  90)
+#define __NR_fchown                     (__NR_Linux +  91)
+#define __NR_lchown                     (__NR_Linux +  92)
+#define __NR_umask                      (__NR_Linux +  93)
+#define __NR_gettimeofday               (__NR_Linux +  94)
+#define __NR_getrlimit                  (__NR_Linux +  95)
+#define __NR_getrusage                  (__NR_Linux +  96)
+#define __NR_sysinfo                    (__NR_Linux +  97)
+#define __NR_times                      (__NR_Linux +  98)
+#define __NR_ptrace                     (__NR_Linux +  99)
+#define __NR_getuid                     (__NR_Linux + 100)
+#define __NR_syslog                     (__NR_Linux + 101)
+#define __NR_getgid                     (__NR_Linux + 102)
+#define __NR_setuid                     (__NR_Linux + 103)
+#define __NR_setgid                     (__NR_Linux + 104)
+#define __NR_geteuid                    (__NR_Linux + 105)
+#define __NR_getegid                    (__NR_Linux + 106)
+#define __NR_setpgid                    (__NR_Linux + 107)
+#define __NR_getppid                    (__NR_Linux + 108)
+#define __NR_getpgrp                    (__NR_Linux + 109)
+#define __NR_setsid                     (__NR_Linux + 110)
+#define __NR_setreuid                   (__NR_Linux + 111)
+#define __NR_setregid                   (__NR_Linux + 112)
+#define __NR_getgroups                  (__NR_Linux + 113)
+#define __NR_setgroups                  (__NR_Linux + 114)
+#define __NR_setresuid                  (__NR_Linux + 115)
+#define __NR_getresuid                  (__NR_Linux + 116)
+#define __NR_setresgid                  (__NR_Linux + 117)
+#define __NR_getresgid                  (__NR_Linux + 118)
+#define __NR_getpgid                    (__NR_Linux + 119)
+#define __NR_setfsuid                   (__NR_Linux + 120)
+#define __NR_setfsgid                   (__NR_Linux + 121)
+#define __NR_getsid                     (__NR_Linux + 122)
+#define __NR_capget                     (__NR_Linux + 123)
+#define __NR_capset                     (__NR_Linux + 124)
+#define __NR_rt_sigpending              (__NR_Linux + 125)
+#define __NR_rt_sigtimedwait            (__NR_Linux + 126)
+#define __NR_rt_sigqueueinfo            (__NR_Linux + 127)
+#define __NR_rt_sigsuspend              (__NR_Linux + 128)
+#define __NR_sigaltstack                (__NR_Linux + 129)
+#define __NR_utime                      (__NR_Linux + 130)
+#define __NR_mknod                      (__NR_Linux + 131)
+#define __NR_personality                (__NR_Linux + 132)
+#define __NR_ustat                      (__NR_Linux + 133)
+#define __NR_statfs                     (__NR_Linux + 134)
+#define __NR_fstatfs                    (__NR_Linux + 135)
+#define __NR_sysfs                      (__NR_Linux + 136)
+#define __NR_getpriority                (__NR_Linux + 137)
+#define __NR_setpriority                (__NR_Linux + 138)
+#define __NR_sched_setparam             (__NR_Linux + 139)
+#define __NR_sched_getparam             (__NR_Linux + 140)
+#define __NR_sched_setscheduler         (__NR_Linux + 141)
+#define __NR_sched_getscheduler         (__NR_Linux + 142)
+#define __NR_sched_get_priority_max     (__NR_Linux + 143)
+#define __NR_sched_get_priority_min     (__NR_Linux + 144)
+#define __NR_sched_rr_get_interval      (__NR_Linux + 145)
+#define __NR_mlock                      (__NR_Linux + 146)
+#define __NR_munlock                    (__NR_Linux + 147)
+#define __NR_mlockall                   (__NR_Linux + 148)
+#define __NR_munlockall                 (__NR_Linux + 149)
+#define __NR_vhangup                    (__NR_Linux + 150)
+#define __NR_pivot_root                 (__NR_Linux + 151)
+#define __NR__sysctl                    (__NR_Linux + 152)
+#define __NR_prctl                      (__NR_Linux + 153)
+#define __NR_adjtimex                   (__NR_Linux + 154)
+#define __NR_setrlimit                  (__NR_Linux + 155)
+#define __NR_chroot                     (__NR_Linux + 156)
+#define __NR_sync                       (__NR_Linux + 157)
+#define __NR_acct                       (__NR_Linux + 158)
+#define __NR_settimeofday               (__NR_Linux + 159)
+#define __NR_mount                      (__NR_Linux + 160)
+#define __NR_umount2                    (__NR_Linux + 161)
+#define __NR_swapon                     (__NR_Linux + 162)
+#define __NR_swapoff                    (__NR_Linux + 163)
+#define __NR_reboot                     (__NR_Linux + 164)
+#define __NR_sethostname                (__NR_Linux + 165)
+#define __NR_setdomainname              (__NR_Linux + 166)
+#define __NR_create_module              (__NR_Linux + 167)
+#define __NR_init_module                (__NR_Linux + 168)
+#define __NR_delete_module              (__NR_Linux + 169)
+#define __NR_get_kernel_syms            (__NR_Linux + 170)
+#define __NR_query_module               (__NR_Linux + 171)
+#define __NR_quotactl                   (__NR_Linux + 172)
+#define __NR_nfsservctl                 (__NR_Linux + 173)
+#define __NR_getpmsg                    (__NR_Linux + 174)
+#define __NR_putpmsg                    (__NR_Linux + 175)
+#define __NR_afs_syscall                (__NR_Linux + 176)
+#define __NR_reserved177                (__NR_Linux + 177)
+#define __NR_gettid                     (__NR_Linux + 178)
+#define __NR_readahead                  (__NR_Linux + 179)
+#define __NR_setxattr                   (__NR_Linux + 180)
+#define __NR_lsetxattr                  (__NR_Linux + 181)
+#define __NR_fsetxattr                  (__NR_Linux + 182)
+#define __NR_getxattr                   (__NR_Linux + 183)
+#define __NR_lgetxattr                  (__NR_Linux + 184)
+#define __NR_fgetxattr                  (__NR_Linux + 185)
+#define __NR_listxattr                  (__NR_Linux + 186)
+#define __NR_llistxattr                 (__NR_Linux + 187)
+#define __NR_flistxattr                 (__NR_Linux + 188)
+#define __NR_removexattr                (__NR_Linux + 189)
+#define __NR_lremovexattr               (__NR_Linux + 190)
+#define __NR_fremovexattr               (__NR_Linux + 191)
+#define __NR_tkill                      (__NR_Linux + 192)
+#define __NR_reserved193                (__NR_Linux + 193)
+#define __NR_futex                      (__NR_Linux + 194)
+#define __NR_sched_setaffinity          (__NR_Linux + 195)
+#define __NR_sched_getaffinity          (__NR_Linux + 196)
+#define __NR_cacheflush                 (__NR_Linux + 197)
+#define __NR_cachectl                   (__NR_Linux + 198)
+#define __NR_sysmips                    (__NR_Linux + 199)
+#define __NR_io_setup                   (__NR_Linux + 200)
+#define __NR_io_destroy                 (__NR_Linux + 201)
+#define __NR_io_getevents               (__NR_Linux + 202)
+#define __NR_io_submit                  (__NR_Linux + 203)
+#define __NR_io_cancel                  (__NR_Linux + 204)
+#define __NR_exit_group                 (__NR_Linux + 205)
+#define __NR_lookup_dcookie             (__NR_Linux + 206)
+#define __NR_epoll_create               (__NR_Linux + 207)
+#define __NR_epoll_ctl                  (__NR_Linux + 208)
+#define __NR_epoll_wait                 (__NR_Linux + 209)
+#define __NR_remap_file_pages           (__NR_Linux + 210)
+#define __NR_rt_sigreturn               (__NR_Linux + 211)
+#define __NR_fcntl64                    (__NR_Linux + 212)
+#define __NR_set_tid_address            (__NR_Linux + 213)
+#define __NR_restart_syscall            (__NR_Linux + 214)
+#define __NR_semtimedop                 (__NR_Linux + 215)
+#define __NR_fadvise64                  (__NR_Linux + 216)
+#define __NR_statfs64                   (__NR_Linux + 217)
+#define __NR_fstatfs64                  (__NR_Linux + 218)
+#define __NR_sendfile64                 (__NR_Linux + 219)
+#define __NR_timer_create               (__NR_Linux + 220)
+#define __NR_timer_settime              (__NR_Linux + 221)
+#define __NR_timer_gettime              (__NR_Linux + 222)
+#define __NR_timer_getoverrun           (__NR_Linux + 223)
+#define __NR_timer_delete               (__NR_Linux + 224)
+#define __NR_clock_settime              (__NR_Linux + 225)
+#define __NR_clock_gettime              (__NR_Linux + 226)
+#define __NR_clock_getres               (__NR_Linux + 227)
+#define __NR_clock_nanosleep            (__NR_Linux + 228)
+#define __NR_tgkill                     (__NR_Linux + 229)
+#define __NR_utimes                     (__NR_Linux + 230)
+#define __NR_mbind                      (__NR_Linux + 231)
+#define __NR_get_mempolicy              (__NR_Linux + 232)
+#define __NR_set_mempolicy              (__NR_Linux + 233)
+#define __NR_mq_open                    (__NR_Linux + 234)
+#define __NR_mq_unlink                  (__NR_Linux + 235)
+#define __NR_mq_timedsend               (__NR_Linux + 236)
+#define __NR_mq_timedreceive            (__NR_Linux + 237)
+#define __NR_mq_notify                  (__NR_Linux + 238)
+#define __NR_mq_getsetattr              (__NR_Linux + 239)
+#define __NR_vserver                    (__NR_Linux + 240)
+#define __NR_waitid                     (__NR_Linux + 241)
+/* #define __NR_sys_setaltroot          (__NR_Linux + 242) */
+#define __NR_add_key                    (__NR_Linux + 243)
+#define __NR_request_key                (__NR_Linux + 244)
+#define __NR_keyctl                     (__NR_Linux + 245)
+#define __NR_set_thread_area            (__NR_Linux + 246)
+#define __NR_inotify_init               (__NR_Linux + 247)
+#define __NR_inotify_add_watch          (__NR_Linux + 248)
+#define __NR_inotify_rm_watch           (__NR_Linux + 249)
+#define __NR_migrate_pages              (__NR_Linux + 250)
+#define __NR_openat                     (__NR_Linux + 251)
+#define __NR_mkdirat                    (__NR_Linux + 252)
+#define __NR_mknodat                    (__NR_Linux + 253)
+#define __NR_fchownat                   (__NR_Linux + 254)
+#define __NR_futimesat                  (__NR_Linux + 255)
+#define __NR_newfstatat                 (__NR_Linux + 256)
+#define __NR_unlinkat                   (__NR_Linux + 257)
+#define __NR_renameat                   (__NR_Linux + 258)
+#define __NR_linkat                     (__NR_Linux + 259)
+#define __NR_symlinkat                  (__NR_Linux + 260)
+#define __NR_readlinkat                 (__NR_Linux + 261)
+#define __NR_fchmodat                   (__NR_Linux + 262)
+#define __NR_faccessat                  (__NR_Linux + 263)
+#define __NR_pselect6                   (__NR_Linux + 264)
+#define __NR_ppoll                      (__NR_Linux + 265)
+#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)
+#define __NR_set_robust_list            (__NR_Linux + 272)
+#define __NR_get_robust_list            (__NR_Linux + 273)
+#define __NR_kexec_load                 (__NR_Linux + 274)
+#define __NR_getcpu                     (__NR_Linux + 275)
+#define __NR_epoll_pwait                (__NR_Linux + 276)
+#define __NR_ioprio_set                 (__NR_Linux + 277)
+#define __NR_ioprio_get                 (__NR_Linux + 278)
+#define __NR_utimensat                  (__NR_Linux + 279)
+#define __NR_signalfd                   (__NR_Linux + 280)
+#define __NR_timerfd                    (__NR_Linux + 281)
+#define __NR_eventfd                    (__NR_Linux + 282)
+#define __NR_fallocate                  (__NR_Linux + 283)
+#define __NR_timerfd_create             (__NR_Linux + 284)
+#define __NR_timerfd_gettime            (__NR_Linux + 285)
+#define __NR_timerfd_settime            (__NR_Linux + 286)
+#define __NR_signalfd4                  (__NR_Linux + 287)
+#define __NR_eventfd2                   (__NR_Linux + 288)
+#define __NR_epoll_create1              (__NR_Linux + 289)
+#define __NR_dup3                       (__NR_Linux + 290)
+#define __NR_pipe2                      (__NR_Linux + 291)
+#define __NR_inotify_init1              (__NR_Linux + 292)
+#define __NR_preadv                     (__NR_Linux + 293)
+#define __NR_pwritev                    (__NR_Linux + 294)
+#define __NR_rt_tgsigqueueinfo          (__NR_Linux + 295)
+#define __NR_perf_event_open            (__NR_Linux + 296)
+#define __NR_accept4                    (__NR_Linux + 297)
+#define __NR_recvmmsg                   (__NR_Linux + 298)
+#define __NR_getdents64                 (__NR_Linux + 299)
+#define __NR_fanotify_init              (__NR_Linux + 300)
+#define __NR_fanotify_mark              (__NR_Linux + 301)
+#define __NR_prlimit64                  (__NR_Linux + 302)
+#define __NR_name_to_handle_at          (__NR_Linux + 303)
+#define __NR_open_by_handle_at          (__NR_Linux + 304)
+#define __NR_clock_adjtime              (__NR_Linux + 305)
+#define __NR_syncfs                     (__NR_Linux + 306)
+#define __NR_sendmmsg                   (__NR_Linux + 307)
+#define __NR_setns                      (__NR_Linux + 308)
+#define __NR_process_vm_readv           (__NR_Linux + 309)
+#define __NR_process_vm_writev          (__NR_Linux + 310)
+#define __NR_kcmp                       (__NR_Linux + 311)
+/*
+ * Offset of the last N32 flavoured syscall
+ */
+#define __NR_Linux_syscalls             311
+#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
+#define __NR_N32_Linux                  6000
+#define __NR_N32_Linux_syscalls         311
+#endif /* _UAPI_ASM_UNISTD_H */
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 414c26920df..8b28bc4e14e 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_CPU_MIPSR2)	+= spram.o
 obj-$(CONFIG_MIPS_VPE_LOADER)   += vpe.o
 obj-$(CONFIG_MIPS_VPE_APSP_API) += rtlx.o
-obj-$(CONFIG_MIPS_APSP_KSPD)    += kspd.o
 obj-$(CONFIG_I8259)             += i8259.o
 obj-$(CONFIG_IRQ_CPU)           += irq_cpu.o
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 6b30fb2caa6..0c4bce4882a 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -12,7 +12,6 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/interrupt.h>
 #include <linux/kbuild.h>
 #include <linux/suspend.h>
 #include <asm/ptrace.h>
@@ -292,15 +291,6 @@ void output_signal_defined(void)
        BLANK();
 }
-void output_irq_cpustat_t_defines(void)
-{
-        COMMENT("Linux irq_cpustat_t offsets.");
-        DEFINE(IC_SOFTIRQ_PENDING,
-                        offsetof(irq_cpustat_t, __softirq_pending));
-        DEFINE(IC_IRQ_CPUSTAT_T, sizeof(irq_cpustat_t));
-        BLANK();
-}
 #ifdef CONFIG_CPU_CAVIUM_OCTEON
 void output_octeon_cop2_state_defines(void)
 {
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index bc58bd10a60..b1fb7af3c35 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -142,7 +142,7 @@ int __cpuinitdata mips_dsp_disabled;
 static int __init dsp_disable(char *s)
 {
-        cpu_data[0].ases &= ~MIPS_ASE_DSP;
+        cpu_data[0].ases &= ~(MIPS_ASE_DSP | MIPS_ASE_DSP2P);
        mips_dsp_disabled = 1;
        return 1;
@@ -429,6 +429,8 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
                c->options |= MIPS_CPU_RIXI;
        if (config3 & MIPS_CONF3_DSP)
                c->ases |= MIPS_ASE_DSP;
+        if (config3 & MIPS_CONF3_DSP2P)
+                c->ases |= MIPS_ASE_DSP2P;
        if (config3 & MIPS_CONF3_VINT)
                c->options |= MIPS_CPU_VINT;
        if (config3 & MIPS_CONF3_VEIC)
@@ -1180,7 +1182,7 @@ __cpuinit void cpu_probe(void)
                c->options &= ~MIPS_CPU_FPU;
        if (mips_dsp_disabled)
-                c->ases &= ~MIPS_ASE_DSP;
+                c->ases &= ~(MIPS_ASE_DSP | MIPS_ASE_DSP2P);
        if (c->options & MIPS_CPU_FPU) {
                c->fpu_id = cpu_get_fpu_id();
@@ -1194,8 +1196,11 @@ __cpuinit void cpu_probe(void)
                }
        }
-        if (cpu_has_mips_r2)
+        if (cpu_has_mips_r2) {
                c->srsets = ((read_c0_srsctl() >> 26) & 0x0f) + 1;
+                /* R2 has Performance Counter Interrupt indicator */
+                c->options |= MIPS_CPU_PCI;
+        }
        else
                c->srsets = 1;
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
deleted file mode 100644
index b77f56bbb47..00000000000
--- a/arch/mips/kernel/kspd.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2005 MIPS Technologies, Inc.  All rights reserved.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  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.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/unistd.h>
-#include <linux/file.h>
-#include <linux/fdtable.h>
-#include <linux/fs.h>
-#include <linux/syscalls.h>
-#include <linux/workqueue.h>
-#include <linux/errno.h>
-#include <linux/list.h>
-#include <asm/vpe.h>
-#include <asm/rtlx.h>
-#include <asm/kspd.h>
-static struct workqueue_struct *workqueue;
-static struct work_struct work;
-extern unsigned long cpu_khz;
-struct mtsp_syscall {
-        int cmd;
-        unsigned char abi;
-        unsigned char size;
-};
-struct mtsp_syscall_ret {
-        int retval;
-        int errno;
-};
-struct mtsp_syscall_generic {
-        int arg0;
-        int arg1;
-        int arg2;
-        int arg3;
-        int arg4;
-        int arg5;
-        int arg6;
-};
-static struct list_head kspd_notifylist;
-static int sp_stopping;
-/* these should match with those in the SDE kit */
-#define MTSP_SYSCALL_BASE       0
-#define MTSP_SYSCALL_EXIT       (MTSP_SYSCALL_BASE + 0)
-#define MTSP_SYSCALL_OPEN       (MTSP_SYSCALL_BASE + 1)
-#define MTSP_SYSCALL_READ       (MTSP_SYSCALL_BASE + 2)
-#define MTSP_SYSCALL_WRITE      (MTSP_SYSCALL_BASE + 3)
-#define MTSP_SYSCALL_CLOSE      (MTSP_SYSCALL_BASE + 4)
-#define MTSP_SYSCALL_LSEEK32    (MTSP_SYSCALL_BASE + 5)
-#define MTSP_SYSCALL_ISATTY     (MTSP_SYSCALL_BASE + 6)
-#define MTSP_SYSCALL_GETTIME    (MTSP_SYSCALL_BASE + 7)
-#define MTSP_SYSCALL_PIPEFREQ   (MTSP_SYSCALL_BASE + 8)
-#define MTSP_SYSCALL_GETTOD     (MTSP_SYSCALL_BASE + 9)
-#define MTSP_SYSCALL_IOCTL     (MTSP_SYSCALL_BASE + 10)
-#define MTSP_O_RDONLY           0x0000
-#define MTSP_O_WRONLY           0x0001
-#define MTSP_O_RDWR             0x0002
-#define MTSP_O_NONBLOCK         0x0004
-#define MTSP_O_APPEND           0x0008
-#define MTSP_O_SHLOCK           0x0010
-#define MTSP_O_EXLOCK           0x0020
-#define MTSP_O_ASYNC            0x0040
-/* XXX: check which of these is actually O_SYNC vs O_DSYNC */
-#define MTSP_O_FSYNC            O_SYNC
-#define MTSP_O_NOFOLLOW         0x0100
-#define MTSP_O_SYNC             0x0080
-#define MTSP_O_CREAT            0x0200
-#define MTSP_O_TRUNC            0x0400
-#define MTSP_O_EXCL             0x0800
-#define MTSP_O_BINARY           0x8000
-extern int tclimit;
-struct apsp_table  {
-        int sp;
-        int ap;
-};
-/* we might want to do the mode flags too */
-struct apsp_table open_flags_table[] = {
-        { MTSP_O_RDWR, O_RDWR },
-        { MTSP_O_WRONLY, O_WRONLY },
-        { MTSP_O_CREAT, O_CREAT },
-        { MTSP_O_TRUNC, O_TRUNC },
-        { MTSP_O_NONBLOCK, O_NONBLOCK },
-        { MTSP_O_APPEND, O_APPEND },
-        { MTSP_O_NOFOLLOW, O_NOFOLLOW }
-};
-struct apsp_table syscall_command_table[] = {
-        { MTSP_SYSCALL_OPEN, __NR_open },
-        { MTSP_SYSCALL_CLOSE, __NR_close },
-        { MTSP_SYSCALL_READ, __NR_read },
-        { MTSP_SYSCALL_WRITE, __NR_write },
-        { MTSP_SYSCALL_LSEEK32, __NR_lseek },
-        { MTSP_SYSCALL_IOCTL, __NR_ioctl }
-};
-static int sp_syscall(int num, int arg0, int arg1, int arg2, int arg3)
-{
-        register long int _num  __asm__("$2") = num;
-        register long int _arg0  __asm__("$4") = arg0;
-        register long int _arg1  __asm__("$5") = arg1;
-        register long int _arg2  __asm__("$6") = arg2;
-        register long int _arg3  __asm__("$7") = arg3;
-        mm_segment_t old_fs;
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        __asm__ __volatile__ (
-        "       syscall                                 \n"
-        : "=r" (_num), "=r" (_arg3)
-        : "r" (_num), "r" (_arg0), "r" (_arg1), "r" (_arg2), "r" (_arg3));
-        set_fs(old_fs);
-        /* $a3 is error flag */
-        if (_arg3)
-                return -_num;
-        return _num;
-}
-static int translate_syscall_command(int cmd)
-{
-        int i;
-        int ret = -1;
-        for (i = 0; i < ARRAY_SIZE(syscall_command_table); i++) {
-                if ((cmd == syscall_command_table[i].sp))
-                        return syscall_command_table[i].ap;
-        }
-        return ret;
-}
-static unsigned int translate_open_flags(int flags)
-{
-        int i;
-        unsigned int ret = 0;
-        for (i = 0; i < ARRAY_SIZE(open_flags_table); i++) {
-                if( (flags & open_flags_table[i].sp) ) {
-                        ret |= open_flags_table[i].ap;
-                }
-        }
-        return ret;
-}
-static int sp_setfsuidgid(uid_t uid, gid_t gid)
-{
-        struct cred *new;
-        new = prepare_creds();
-        if (!new)
-                return -ENOMEM;
-        new->fsuid = uid;
-        new->fsgid = gid;
-        commit_creds(new);
-        return 0;
-}
-/*
- * Expects a request to be on the sysio channel. Reads it.  Decides whether
- * its a linux syscall and runs it, or whatever.  Puts the return code back
- * into the request and sends the whole thing back.
- */
-void sp_work_handle_request(void)
-{
-        struct mtsp_syscall sc;
-        struct mtsp_syscall_generic generic;
-        struct mtsp_syscall_ret ret;
-        struct kspd_notifications *n;
-        unsigned long written;
-        mm_segment_t old_fs;
-        struct timeval tv;
-        struct timezone tz;
-        int err, cmd;
-        char *vcwd;
-        int size;
-        ret.retval = -1;
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        if (!rtlx_read(RTLX_CHANNEL_SYSIO, &sc, sizeof(struct mtsp_syscall))) {
-                set_fs(old_fs);
-                printk(KERN_ERR "Expected request but nothing to read\n");
-                return;
-        }
-        size = sc.size;
-        if (size) {
-                if (!rtlx_read(RTLX_CHANNEL_SYSIO, &generic, size)) {
-                        set_fs(old_fs);
-                        printk(KERN_ERR "Expected request but nothing to read\n");
-                        return;
-                }
-        }
-        /* Run the syscall at the privilege of the user who loaded the
-           SP program */
-        if (vpe_getuid(tclimit)) {
-                err = sp_setfsuidgid(vpe_getuid(tclimit), vpe_getgid(tclimit));
-                if (!err)
-                        pr_err("Change of creds failed\n");
-        }
-        switch (sc.cmd) {
-        /* needs the flags argument translating from SDE kit to
-           linux */
-        case MTSP_SYSCALL_PIPEFREQ:
-                ret.retval = cpu_khz * 1000;
-                ret.errno = 0;
-                break;
-        case MTSP_SYSCALL_GETTOD:
-                memset(&tz, 0, sizeof(tz));
-                if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,
-                                             (int)&tz, 0, 0)) == 0)
-                        ret.retval = tv.tv_sec;
-                break;
-        case MTSP_SYSCALL_EXIT:
-                list_for_each_entry(n, &kspd_notifylist, list)
-                        n->kspd_sp_exit(tclimit);
-                sp_stopping = 1;
-                printk(KERN_DEBUG "KSPD got exit syscall from SP exitcode %d\n",
-                       generic.arg0);
-                break;
-        case MTSP_SYSCALL_OPEN:
-                generic.arg1 = translate_open_flags(generic.arg1);
-                vcwd = vpe_getcwd(tclimit);
-                /* change to cwd of the process that loaded the SP program */
-                old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                sys_chdir(vcwd);
-                set_fs(old_fs);
-                sc.cmd = __NR_open;
-                /* fall through */
-        default:
-                if ((sc.cmd >= __NR_Linux) &&
-                    (sc.cmd <= (__NR_Linux +  __NR_Linux_syscalls)) )
-                        cmd = sc.cmd;
-                else
-                        cmd = translate_syscall_command(sc.cmd);
-                if (cmd >= 0) {
-                        ret.retval = sp_syscall(cmd, generic.arg0, generic.arg1,
-                                                generic.arg2, generic.arg3);
-                } else
-                        printk(KERN_WARNING
-                               "KSPD: Unknown SP syscall number %d\n", sc.cmd);
-                break;
-        } /* switch */
-        if (vpe_getuid(tclimit)) {
-                err = sp_setfsuidgid(0, 0);
-                if (!err)
-                        pr_err("restoring old creds failed\n");
-        }
-        old_fs = get_fs();
-        set_fs(KERNEL_DS);
-        written = rtlx_write(RTLX_CHANNEL_SYSIO, &ret, sizeof(ret));
-        set_fs(old_fs);
-        if (written < sizeof(ret))
-                printk("KSPD: sp_work_handle_request failed to send to SP\n");
-}
-static void sp_cleanup(void)
-{
-        struct files_struct *files = current->files;
-        int i, j;
-        struct fdtable *fdt;
-        j = 0;
-        /*
-         * It is safe to dereference the fd table without RCU or
-         * ->file_lock
-         */
-        fdt = files_fdtable(files);
-        for (;;) {
-                unsigned long set;
-                i = j * BITS_PER_LONG;
-                if (i >= fdt->max_fds)
-                        break;
-                set = fdt->open_fds[j++];
-                while (set) {
-                        if (set & 1) {
-                                struct file * file = xchg(&fdt->fd[i], NULL);
-                                if (file)
-                                        filp_close(file, files);
-                        }
-                        i++;
-                        set >>= 1;
-                }
-        }
-        /* Put daemon cwd back to root to avoid umount problems */
-        sys_chdir("/");
-}
-static int channel_open;
-/* the work handler */
-static void sp_work(struct work_struct *unused)
-{
-        if (!channel_open) {
-                if( rtlx_open(RTLX_CHANNEL_SYSIO, 1) != 0) {
-                        printk("KSPD: unable to open sp channel\n");
-                        sp_stopping = 1;
-                } else {
-                        channel_open++;
-                        printk(KERN_DEBUG "KSPD: SP channel opened\n");
-                }
-        } else {
-                /* wait for some data, allow it to sleep */
-                rtlx_read_poll(RTLX_CHANNEL_SYSIO, 1);
-                /* Check we haven't been woken because we are stopping */
-                if (!sp_stopping)
-                        sp_work_handle_request();
-        }
-        if (!sp_stopping)
-                queue_work(workqueue, &work);
-        else
-                sp_cleanup();
-}
-static void startwork(int vpe)
-{
-        sp_stopping = channel_open = 0;
-        if (workqueue == NULL) {
-                if ((workqueue = create_singlethread_workqueue("kspd")) == NULL) {
-                        printk(KERN_ERR "unable to start kspd\n");
-                        return;
-                }
-                INIT_WORK(&work, sp_work);
-        }
-        queue_work(workqueue, &work);
-}
-static void stopwork(int vpe)
-{
-        sp_stopping = 1;
-        printk(KERN_DEBUG "KSPD: SP stopping\n");
-}
-void kspd_notify(struct kspd_notifications *notify)
-{
-        list_add(&notify->list, &kspd_notifylist);
-}
-static struct vpe_notifications notify;
-static int kspd_module_init(void)
-{
-        INIT_LIST_HEAD(&kspd_notifylist);
-        notify.start = startwork;
-        notify.stop = stopwork;
-        vpe_notify(tclimit, &notify);
-        return 0;
-}
-static void kspd_module_exit(void)
-{
-}
-module_init(kspd_module_init);
-module_exit(kspd_module_exit);
-MODULE_DESCRIPTION("MIPS KSPD");
-MODULE_AUTHOR("Elizabeth Oldham, MIPS Technologies, Inc.");
-MODULE_LICENSE("GPL");
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index 2f28d3b5568..a9b995dcf69 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -28,6 +28,8 @@
 #include <asm/time.h> /* For perf_irq */
 #define MIPS_MAX_HWEVENTS 4
+#define MIPS_TCS_PER_COUNTER 2
+#define MIPS_CPUID_TO_COUNTER_MASK (MIPS_TCS_PER_COUNTER - 1)
 struct cpu_hw_events {
        /* Array of events on this cpu. */
@@ -78,7 +80,6 @@ struct mips_perf_event {
 static struct mips_perf_event raw_event;
 static DEFINE_MUTEX(raw_event_mutex);
-#define UNSUPPORTED_PERF_EVENT_ID 0xffffffff
 #define C(x) PERF_COUNT_HW_CACHE_##x
 struct mips_pmu {
@@ -109,13 +110,20 @@ static struct mips_pmu mipspmu;
 #define M_PERFCTL_INTERRUPT_ENABLE      (1      <<  4)
 #define M_PERFCTL_EVENT(event)          (((event) & 0x3ff)  << 5)
 #define M_PERFCTL_VPEID(vpe)            ((vpe)    << 16)
+#ifdef CONFIG_CPU_BMIPS5000
+#define M_PERFCTL_MT_EN(filter)         0
+#else /* !CONFIG_CPU_BMIPS5000 */
 #define M_PERFCTL_MT_EN(filter)         ((filter) << 20)
+#endif /* CONFIG_CPU_BMIPS5000 */
 #define    M_TC_EN_ALL                  M_PERFCTL_MT_EN(0)
 #define    M_TC_EN_VPE                  M_PERFCTL_MT_EN(1)
 #define    M_TC_EN_TC                   M_PERFCTL_MT_EN(2)
 #define M_PERFCTL_TCID(tcid)            ((tcid)   << 22)
 #define M_PERFCTL_WIDE                  (1      << 30)
 #define M_PERFCTL_MORE                  (1      << 31)
+#define M_PERFCTL_TC                    (1      << 30)
 #define M_PERFCTL_COUNT_EVENT_WHENEVER  (M_PERFCTL_EXL |                \
                                        M_PERFCTL_KERNEL |              \
@@ -131,21 +139,21 @@ static struct mips_pmu mipspmu;
 #define M_PERFCTL_EVENT_MASK            0xfe0
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
 static int cpu_has_mipsmt_pertccounters;
 static DEFINE_RWLOCK(pmuint_rwlock);
+#if defined(CONFIG_CPU_BMIPS5000)
+#define vpe_id()        (cpu_has_mipsmt_pertccounters ? \
+                         0 : (smp_processor_id() & MIPS_CPUID_TO_COUNTER_MASK))
+#else
 /*
 * FIXME: For VSMP, vpe_id() is redefined for Perf-events, because
 * cpu_data[cpuid].vpe_id reports 0 for _both_ CPUs.
 */
-#if defined(CONFIG_HW_PERF_EVENTS)
-#define vpe_id()        (cpu_has_mipsmt_pertccounters ? \
-                        0 : smp_processor_id())
-#else
 #define vpe_id()        (cpu_has_mipsmt_pertccounters ? \
-                        0 : cpu_data[smp_processor_id()].vpe_id)
+                         0 : smp_processor_id())
 #endif
 /* Copied from op_model_mipsxx.c */
@@ -162,10 +170,10 @@ static unsigned int counters_total_to_per_cpu(unsigned int counters)
        return counters >> vpe_shift();
 }
-#else /* !CONFIG_MIPS_MT_SMP */
+#else /* !CONFIG_MIPS_PERF_SHARED_TC_COUNTERS */
 #define vpe_id()        0
-#endif /* CONFIG_MIPS_MT_SMP */
+#endif /* CONFIG_MIPS_PERF_SHARED_TC_COUNTERS */
 static void resume_local_counters(void);
 static void pause_local_counters(void);
@@ -340,6 +348,11 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)
                (evt->config_base & M_PERFCTL_CONFIG_MASK) |
                /* Make sure interrupt enabled. */
                M_PERFCTL_INTERRUPT_ENABLE;
+        if (IS_ENABLED(CONFIG_CPU_BMIPS5000))
+                /* enable the counter for the calling thread */
+                cpuc->saved_ctrl[idx] |=
+                        (1 << (12 + vpe_id())) | M_PERFCTL_TC;
        /*
         * We do not actually let the counter run. Leave it until start().
         */
@@ -509,7 +522,7 @@ static void mipspmu_read(struct perf_event *event)
 static void mipspmu_enable(struct pmu *pmu)
 {
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
        write_unlock(&pmuint_rwlock);
 #endif
        resume_local_counters();
@@ -529,7 +542,7 @@ static void mipspmu_enable(struct pmu *pmu)
 static void mipspmu_disable(struct pmu *pmu)
 {
        pause_local_counters();
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
        write_lock(&pmuint_rwlock);
 #endif
 }
@@ -664,13 +677,10 @@ static unsigned int mipspmu_perf_event_encode(const struct mips_perf_event *pev)
 static const struct mips_perf_event *mipspmu_map_general_event(int idx)
 {
-        const struct mips_perf_event *pev;
-        pev = ((*mipspmu.general_event_map)[idx].event_id ==
-                UNSUPPORTED_PERF_EVENT_ID ? ERR_PTR(-EOPNOTSUPP) :
-                &(*mipspmu.general_event_map)[idx]);
-        return pev;
+        if ((*mipspmu.general_event_map)[idx].cntr_mask == 0)
+                return ERR_PTR(-EOPNOTSUPP);
+        return &(*mipspmu.general_event_map)[idx];
 }
 static const struct mips_perf_event *mipspmu_map_cache_event(u64 config)
@@ -695,7 +705,7 @@ static const struct mips_perf_event *mipspmu_map_cache_event(u64 config)
                                        [cache_op]
                                        [cache_result]);
-        if (pev->event_id == UNSUPPORTED_PERF_EVENT_ID)
+        if (pev->cntr_mask == 0)
                return ERR_PTR(-EOPNOTSUPP);
        return pev;
@@ -800,11 +810,8 @@ static const struct mips_perf_event mipsxxcore_event_map
                                [PERF_COUNT_HW_MAX] = {
        [PERF_COUNT_HW_CPU_CYCLES] = { 0x00, CNTR_EVEN | CNTR_ODD, P },
        [PERF_COUNT_HW_INSTRUCTIONS] = { 0x01, CNTR_EVEN | CNTR_ODD, T },
-        [PERF_COUNT_HW_CACHE_REFERENCES] = { UNSUPPORTED_PERF_EVENT_ID },
-        [PERF_COUNT_HW_CACHE_MISSES] = { UNSUPPORTED_PERF_EVENT_ID },
        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = { 0x02, CNTR_EVEN, T },
        [PERF_COUNT_HW_BRANCH_MISSES] = { 0x02, CNTR_ODD, T },
-        [PERF_COUNT_HW_BUS_CYCLES] = { UNSUPPORTED_PERF_EVENT_ID },
 };
 /* 74K core has different branch event code. */
@@ -812,11 +819,8 @@ static const struct mips_perf_event mipsxx74Kcore_event_map
                                [PERF_COUNT_HW_MAX] = {
        [PERF_COUNT_HW_CPU_CYCLES] = { 0x00, CNTR_EVEN | CNTR_ODD, P },
        [PERF_COUNT_HW_INSTRUCTIONS] = { 0x01, CNTR_EVEN | CNTR_ODD, T },
-        [PERF_COUNT_HW_CACHE_REFERENCES] = { UNSUPPORTED_PERF_EVENT_ID },
-        [PERF_COUNT_HW_CACHE_MISSES] = { UNSUPPORTED_PERF_EVENT_ID },
        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = { 0x27, CNTR_EVEN, T },
        [PERF_COUNT_HW_BRANCH_MISSES] = { 0x27, CNTR_ODD, T },
-        [PERF_COUNT_HW_BUS_CYCLES] = { UNSUPPORTED_PERF_EVENT_ID },
 };
 static const struct mips_perf_event octeon_event_map[PERF_COUNT_HW_MAX] = {
@@ -829,6 +833,13 @@ static const struct mips_perf_event octeon_event_map[PERF_COUNT_HW_MAX] = {
        [PERF_COUNT_HW_BUS_CYCLES] = { 0x25, CNTR_ALL },
 };
+static const struct mips_perf_event bmips5000_event_map
+                                [PERF_COUNT_HW_MAX] = {
+        [PERF_COUNT_HW_CPU_CYCLES] = { 0x00, CNTR_EVEN | CNTR_ODD, T },
+        [PERF_COUNT_HW_INSTRUCTIONS] = { 0x01, CNTR_EVEN | CNTR_ODD, T },
+        [PERF_COUNT_HW_BRANCH_MISSES] = { 0x02, CNTR_ODD, T },
+};
 /* 24K/34K/1004K cores can share the same cache event map. */
 static const struct mips_perf_event mipsxxcore_cache_map
                                [PERF_COUNT_HW_CACHE_MAX]
@@ -849,10 +860,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x0a, CNTR_EVEN, T },
                [C(RESULT_MISS)]        = { 0x0b, CNTR_EVEN | CNTR_ODD, T },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(L1I)] = {
        [C(OP_READ)] = {
@@ -869,7 +876,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                 * Note that MIPS has only "hit" events countable for
                 * the prefetch operation.
                 */
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
        },
 },
 [C(LL)] = {
@@ -881,10 +887,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x15, CNTR_ODD, P },
                [C(RESULT_MISS)]        = { 0x16, CNTR_EVEN, P },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(DTLB)] = {
        [C(OP_READ)] = {
@@ -895,10 +897,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x06, CNTR_EVEN, T },
                [C(RESULT_MISS)]        = { 0x06, CNTR_ODD, T },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(ITLB)] = {
        [C(OP_READ)] = {
@@ -909,10 +907,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x05, CNTR_EVEN, T },
                [C(RESULT_MISS)]        = { 0x05, CNTR_ODD, T },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(BPU)] = {
        /* Using the same code for *HW_BRANCH* */
@@ -924,24 +918,6 @@ static const struct mips_perf_event mipsxxcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x02, CNTR_EVEN, T },
                [C(RESULT_MISS)]        = { 0x02, CNTR_ODD, T },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-},
-[C(NODE)] = {
-        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 };
@@ -965,10 +941,6 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x17, CNTR_ODD, T },
                [C(RESULT_MISS)]        = { 0x18, CNTR_ODD, T },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(L1I)] = {
        [C(OP_READ)] = {
@@ -985,7 +957,6 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                 * Note that MIPS has only "hit" events countable for
                 * the prefetch operation.
                 */
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
        },
 },
 [C(LL)] = {
@@ -997,25 +968,6 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x1c, CNTR_ODD, P },
                [C(RESULT_MISS)]        = { 0x1d, CNTR_EVEN | CNTR_ODD, P },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-},
-[C(DTLB)] = {
-        /* 74K core does not have specific DTLB events. */
-        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(ITLB)] = {
        [C(OP_READ)] = {
@@ -1026,10 +978,6 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x04, CNTR_EVEN, T },
                [C(RESULT_MISS)]        = { 0x04, CNTR_ODD, T },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(BPU)] = {
        /* Using the same code for *HW_BRANCH* */
@@ -1041,23 +989,64 @@ static const struct mips_perf_event mipsxx74Kcore_cache_map
                [C(RESULT_ACCESS)]      = { 0x27, CNTR_EVEN, T },
                [C(RESULT_MISS)]        = { 0x27, CNTR_ODD, T },
        },
-        [C(OP_PREFETCH)] = {
+},
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
+};
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
+/* BMIPS5000 */
+static const struct mips_perf_event bmips5000_cache_map
+                                [PERF_COUNT_HW_CACHE_MAX]
+                                [PERF_COUNT_HW_CACHE_OP_MAX]
+                                [PERF_COUNT_HW_CACHE_RESULT_MAX] = {
+[C(L1D)] = {
+        /*
+         * Like some other architectures (e.g. ARM), the performance
+         * counters don't differentiate between read and write
+         * accesses/misses, so this isn't strictly correct, but it's the
+         * best we can do. Writes and reads get combined.
+         */
+        [C(OP_READ)] = {
+                [C(RESULT_ACCESS)]      = { 12, CNTR_EVEN, T },
+                [C(RESULT_MISS)]        = { 12, CNTR_ODD, T },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_ACCESS)]      = { 12, CNTR_EVEN, T },
+                [C(RESULT_MISS)]        = { 12, CNTR_ODD, T },
        },
 },
-[C(NODE)] = {
+[C(L1I)] = {
        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
+                [C(RESULT_ACCESS)]      = { 10, CNTR_EVEN, T },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
+                [C(RESULT_MISS)]        = { 10, CNTR_ODD, T },
        },
        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
+                [C(RESULT_ACCESS)]      = { 10, CNTR_EVEN, T },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
+                [C(RESULT_MISS)]        = { 10, CNTR_ODD, T },
        },
        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
+                [C(RESULT_ACCESS)]      = { 23, CNTR_EVEN, T },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
+                /*
+                 * Note that MIPS has only "hit" events countable for
+                 * the prefetch operation.
+                 */
+        },
+},
+[C(LL)] = {
+        [C(OP_READ)] = {
+                [C(RESULT_ACCESS)]      = { 28, CNTR_EVEN, P },
+                [C(RESULT_MISS)]        = { 28, CNTR_ODD, P },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_ACCESS)]      = { 28, CNTR_EVEN, P },
+                [C(RESULT_MISS)]        = { 28, CNTR_ODD, P },
+        },
+},
+[C(BPU)] = {
+        /* Using the same code for *HW_BRANCH* */
+        [C(OP_READ)] = {
+                [C(RESULT_MISS)]        = { 0x02, CNTR_ODD, T },
+        },
+        [C(OP_WRITE)] = {
+                [C(RESULT_MISS)]        = { 0x02, CNTR_ODD, T },
        },
 },
 };
@@ -1074,39 +1063,14 @@ static const struct mips_perf_event octeon_cache_map
        },
        [C(OP_WRITE)] = {
                [C(RESULT_ACCESS)]      = { 0x30, CNTR_ALL },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
        },
 },
 [C(L1I)] = {
        [C(OP_READ)] = {
                [C(RESULT_ACCESS)]      = { 0x18, CNTR_ALL },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
        },
        [C(OP_PREFETCH)] = {
                [C(RESULT_ACCESS)]      = { 0x19, CNTR_ALL },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-},
-[C(LL)] = {
-        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
        },
 },
 [C(DTLB)] = {
@@ -1115,46 +1079,16 @@ static const struct mips_perf_event octeon_cache_map
         * read and write.
         */
        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
                [C(RESULT_MISS)]        = { 0x35, CNTR_ALL },
        },
        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
                [C(RESULT_MISS)]        = { 0x35, CNTR_ALL },
        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 [C(ITLB)] = {
        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
                [C(RESULT_MISS)]        = { 0x37, CNTR_ALL },
        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-},
-[C(BPU)] = {
-        /* Using the same code for *HW_BRANCH* */
-        [C(OP_READ)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_WRITE)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
-        [C(OP_PREFETCH)] = {
-                [C(RESULT_ACCESS)]      = { UNSUPPORTED_PERF_EVENT_ID },
-                [C(RESULT_MISS)]        = { UNSUPPORTED_PERF_EVENT_ID },
-        },
 },
 };
@@ -1304,7 +1238,7 @@ static int mipsxx_pmu_handle_shared_irq(void)
        int handled = IRQ_NONE;
        struct pt_regs *regs;
-        if (cpu_has_mips_r2 && !(read_c0_cause() & (1 << 26)))
+        if (cpu_has_perf_cntr_intr_bit && !(read_c0_cause() & CAUSEF_PCI))
                return handled;
        /*
         * First we pause the local counters, so that when we are locked
@@ -1314,7 +1248,7 @@ static int mipsxx_pmu_handle_shared_irq(void)
         * See also mipsxx_pmu_start().
         */
        pause_local_counters();
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
        read_lock(&pmuint_rwlock);
 #endif
@@ -1346,7 +1280,7 @@ static int mipsxx_pmu_handle_shared_irq(void)
        if (handled == IRQ_HANDLED)
                irq_work_run();
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
        read_unlock(&pmuint_rwlock);
 #endif
        resume_local_counters();
@@ -1391,6 +1325,11 @@ static irqreturn_t mipsxx_pmu_handle_irq(int irq, void *dev)
 #define IS_RANGE_V_1004K_EVENT(r)       ((r) == 47)
 #endif
+/* BMIPS5000 */
+#define IS_BOTH_COUNTERS_BMIPS5000_EVENT(b)                             \
+        ((b) == 0 || (b) == 1)
 /*
 * User can use 0-255 raw events, where 0-127 for the events of even
 * counters, and 128-255 for odd counters. Note that bit 7 is used to
@@ -1461,6 +1400,12 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
                        raw_event.range = T;
 #endif
                break;
+        case CPU_BMIPS5000:
+                if (IS_BOTH_COUNTERS_BMIPS5000_EVENT(base_id))
+                        raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
+                else
+                        raw_event.cntr_mask =
+                                raw_id > 127 ? CNTR_ODD : CNTR_EVEN;
        }
        return &raw_event;
@@ -1513,7 +1458,7 @@ init_hw_perf_events(void)
                return -ENODEV;
        }
-#ifdef CONFIG_MIPS_MT_SMP
+#ifdef CONFIG_MIPS_PERF_SHARED_TC_COUNTERS
        cpu_has_mipsmt_pertccounters = read_c0_config7() & (1<<19);
        if (!cpu_has_mipsmt_pertccounters)
                counters = counters_total_to_per_cpu(counters);
@@ -1572,6 +1517,11 @@ init_hw_perf_events(void)
                mipspmu.cache_event_map = &octeon_cache_map;
                mipspmu.map_raw_event = octeon_pmu_map_raw_event;
                break;
+        case CPU_BMIPS5000:
+                mipspmu.name = "BMIPS5000";
+                mipspmu.general_event_map = &bmips5000_event_map;
+                mipspmu.cache_event_map = &bmips5000_cache_map;
+                break;
        default:
                pr_cont("Either hardware does not support performance "
                        "counters, or not yet implemented.\n");
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 5542817c1b4..07dff54f2ce 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -64,14 +64,17 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                                cpu_data[n].watch_reg_masks[i]);
                seq_printf(m, "]\n");
        }
-        seq_printf(m, "ASEs implemented\t:%s%s%s%s%s%s\n",
-                      cpu_has_mips16 ? " mips16" : "",
+        seq_printf(m, "ASEs implemented\t:");
-                      cpu_has_mdmx ? " mdmx" : "",
+        if (cpu_has_mips16)     seq_printf(m, "%s", " mips16");
-                      cpu_has_mips3d ? " mips3d" : "",
+        if (cpu_has_mdmx)       seq_printf(m, "%s", " mdmx");
-                      cpu_has_smartmips ? " smartmips" : "",
+        if (cpu_has_mips3d)     seq_printf(m, "%s", " mips3d");
-                      cpu_has_dsp ? " dsp" : "",
+        if (cpu_has_smartmips)  seq_printf(m, "%s", " smartmips");
-                      cpu_has_mipsmt ? " mt" : ""
+        if (cpu_has_dsp)        seq_printf(m, "%s", " dsp");
-                );
+        if (cpu_has_dsp2)       seq_printf(m, "%s", " dsp2");
+        if (cpu_has_mipsmt)     seq_printf(m, "%s", " mt");
+        seq_printf(m, "\n");
        seq_printf(m, "shadow register sets\t: %d\n",
                      cpu_data[n].srsets);
        seq_printf(m, "kscratch registers\t: %d\n",
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index df243a64f43..007ccbe1e26 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -1,6 +1,13 @@
 #include <asm/asm-offsets.h>
 #include <asm/page.h>
 #include <asm/thread_info.h>
+/*
+ * Put .bss..swapper_pg_dir as the first thing in .bss. This will
+ * ensure that it has .bss alignment (64K).
+ */
+#define BSS_FIRST_SECTIONS *(.bss..swapper_pg_dir)
 #include <asm-generic/vmlinux.lds.h>
 #undef mips
@@ -119,11 +126,21 @@ SECTIONS
        }
        PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
-        . = ALIGN(PAGE_SIZE);
+        /*
+         * Align to 64K in attempt to eliminate holes before the
+         * .bss..swapper_pg_dir section at the start of .bss.  This
+         * also satisfies PAGE_SIZE alignment as the largest page size
+         * allowed is 64K.
+         */
+        . = ALIGN(0x10000);
        __init_end = .;
        /* freed after init ends here */
-        BSS_SECTION(0, 0, 0)
+        /*
+         * Force .bss to 64K alignment so that .bss..swapper_pg_dir
+         * gets that alignment.  .sbss should be empty, so there will be
+         * no holes after __init_end. */
+        BSS_SECTION(0, 0x10000, 0)
        _end = . ;
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index f6f91523cb1..eec690af658 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -50,7 +50,6 @@
 #include <asm/mips_mt.h>
 #include <asm/processor.h>
 #include <asm/vpe.h>
-#include <asm/kspd.h>
 typedef void *vpe_handle;
@@ -69,11 +68,6 @@ static char module_name[] = "vpe";
 static int major;
 static const int minor = 1;     /* fixed for now  */
-#ifdef CONFIG_MIPS_APSP_KSPD
-static struct kspd_notifications kspd_events;
-static int kspd_events_reqd;
-#endif
 /* grab the likely amount of memory we will need. */
 #ifdef CONFIG_MIPS_VPE_LOADER_TOM
 #define P_SIZE (2 * 1024 * 1024)
@@ -1101,14 +1095,6 @@ static int vpe_open(struct inode *inode, struct file *filp)
        v->uid = filp->f_cred->fsuid;
        v->gid = filp->f_cred->fsgid;
-#ifdef CONFIG_MIPS_APSP_KSPD
-        /* get kspd to tell us when a syscall_exit happens */
-        if (!kspd_events_reqd) {
-                kspd_notify(&kspd_events);
-                kspd_events_reqd++;
-        }
-#endif
        v->cwd[0] = 0;
        ret = getcwd(v->cwd, VPE_PATH_MAX);
        if (ret < 0)
@@ -1341,13 +1327,6 @@ char *vpe_getcwd(int index)
 EXPORT_SYMBOL(vpe_getcwd);
-#ifdef CONFIG_MIPS_APSP_KSPD
-static void kspd_sp_exit( int sp_id)
-{
-        cleanup_tc(get_tc(sp_id));
-}
-#endif
 static ssize_t store_kill(struct device *dev, struct device_attribute *attr,
                          const char *buf, size_t len)
 {
@@ -1585,9 +1564,6 @@ out_reenable:
        emt(mtflags);
        local_irq_restore(flags);
-#ifdef CONFIG_MIPS_APSP_KSPD
-        kspd_events.kspd_sp_exit = kspd_sp_exit;
-#endif
        return 0;
 out_class:
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 1a85ba92eb5..be9acb2b959 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -469,19 +469,20 @@ void __init_refok free_initmem(void)
 #ifndef CONFIG_MIPS_PGD_C0_CONTEXT
 unsigned long pgd_current[NR_CPUS];
 #endif
-/*
- * On 64-bit we've got three-level pagetables with a slightly
- * different layout ...
- */
-#define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order)))
 /*
 * gcc 3.3 and older have trouble determining that PTRS_PER_PGD and PGD_ORDER
 * are constants.  So we use the variants from asm-offset.h until that gcc
 * will officially be retired.
+ *
+ * Align swapper_pg_dir in to 64K, allows its address to be loaded
+ * with a single LUI instruction in the TLB handlers.  If we used
+ * __aligned(64K), its size would get rounded up to the alignment
+ * size, and waste space.  So we place it in its own section and align
+ * it in the linker script.
 */
-pgd_t swapper_pg_dir[_PTRS_PER_PGD] __page_aligned(_PGD_ORDER);
+pgd_t swapper_pg_dir[_PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
 #ifndef __PAGETABLE_PMD_FOLDED
-pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned(PMD_ORDER);
+pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned_bss;
 #endif
-pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER);
+pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss;
diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c
index cda4e300eb0..25407794edb 100644
--- a/arch/mips/mm/pgtable-64.c
+++ b/arch/mips/mm/pgtable-64.c
@@ -26,17 +26,17 @@ void pgd_init(unsigned long page)
        p = (unsigned long *) page;
        end = p + PTRS_PER_PGD;
-        while (p < end) {
+        do {
                p[0] = entry;
                p[1] = entry;
                p[2] = entry;
                p[3] = entry;
                p[4] = entry;
-                p[5] = entry;
-                p[6] = entry;
-                p[7] = entry;
                p += 8;
-        }
+                p[-3] = entry;
+                p[-2] = entry;
+                p[-1] = entry;
+        } while (p != end);
 }
 #ifndef __PAGETABLE_PMD_FOLDED
@@ -47,17 +47,17 @@ void pmd_init(unsigned long addr, unsigned long pagetable)
        p = (unsigned long *) addr;
        end = p + PTRS_PER_PMD;
-        while (p < end) {
+        do {
                p[0] = pagetable;
                p[1] = pagetable;
                p[2] = pagetable;
                p[3] = pagetable;
                p[4] = pagetable;
-                p[5] = pagetable;
-                p[6] = pagetable;
-                p[7] = pagetable;
                p += 8;
-        }
+                p[-3] = pagetable;
+                p[-2] = pagetable;
+                p[-1] = pagetable;
+        } while (p != end);
 }
 #endif
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index e09d4925690..658a520364c 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -599,8 +599,7 @@ static __cpuinit __maybe_unused void build_convert_pte_to_entrylo(u32 **p,
                                                                  unsigned int reg)
 {
        if (cpu_has_rixi) {
-                UASM_i_SRL(p, reg, reg, ilog2(_PAGE_NO_EXEC));
+                UASM_i_ROTR(p, reg, reg, ilog2(_PAGE_GLOBAL));
-                UASM_i_ROTR(p, reg, reg, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
        } else {
 #ifdef CONFIG_64BIT_PHYS_ADDR
                uasm_i_dsrl_safe(p, reg, reg, ilog2(_PAGE_GLOBAL));
@@ -1019,11 +1018,9 @@ static void __cpuinit build_update_entries(u32 **p, unsigned int tmp,
                uasm_i_ld(p, tmp, 0, ptep); /* get even pte */
                uasm_i_ld(p, ptep, sizeof(pte_t), ptep); /* get odd pte */
                if (cpu_has_rixi) {
-                        UASM_i_SRL(p, tmp, tmp, ilog2(_PAGE_NO_EXEC));
+                        UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL));
-                        UASM_i_SRL(p, ptep, ptep, ilog2(_PAGE_NO_EXEC));
-                        UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
                        UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */
-                        UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                        UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL));
                } else {
                        uasm_i_dsrl_safe(p, tmp, tmp, ilog2(_PAGE_GLOBAL)); /* convert to entrylo0 */
                        UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */
@@ -1046,13 +1043,11 @@ static void __cpuinit build_update_entries(u32 **p, unsigned int tmp,
        if (r45k_bvahwbug())
                build_tlb_probe_entry(p);
        if (cpu_has_rixi) {
-                UASM_i_SRL(p, tmp, tmp, ilog2(_PAGE_NO_EXEC));
+                UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL));
-                UASM_i_SRL(p, ptep, ptep, ilog2(_PAGE_NO_EXEC));
-                UASM_i_ROTR(p, tmp, tmp, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
                if (r4k_250MHZhwbug())
                        UASM_i_MTC0(p, 0, C0_ENTRYLO0);
                UASM_i_MTC0(p, tmp, C0_ENTRYLO0); /* load it */
-                UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
+                UASM_i_ROTR(p, ptep, ptep, ilog2(_PAGE_GLOBAL));
        } else {
                UASM_i_SRL(p, tmp, tmp, ilog2(_PAGE_GLOBAL)); /* convert to entrylo0 */
                if (r4k_250MHZhwbug())
@@ -1212,13 +1207,9 @@ build_fast_tlb_refill_handler (u32 **p, struct uasm_label **l,
                UASM_i_LW(p, odd, sizeof(pte_t), ptr); /* get odd pte */
        }
        if (cpu_has_rixi) {
-                uasm_i_dsrl_safe(p, even, even, ilog2(_PAGE_NO_EXEC));
+                uasm_i_drotr(p, even, even, ilog2(_PAGE_GLOBAL));
-                uasm_i_dsrl_safe(p, odd, odd, ilog2(_PAGE_NO_EXEC));
-                uasm_i_drotr(p, even, even,
-                             ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
                UASM_i_MTC0(p, even, C0_ENTRYLO0); /* load it */
-                uasm_i_drotr(p, odd, odd,
+                uasm_i_drotr(p, odd, odd, ilog2(_PAGE_GLOBAL));
-                             ilog2(_PAGE_GLOBAL) - ilog2(_PAGE_NO_EXEC));
        } else {
                uasm_i_dsrl_safe(p, even, even, ilog2(_PAGE_GLOBAL));
                UASM_i_MTC0(p, even, C0_ENTRYLO0); /* load it */
diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c
index 819622f93e9..9a1a2244522 100644
--- a/arch/mips/pci/fixup-malta.c
+++ b/arch/mips/pci/fixup-malta.c
@@ -8,7 +8,8 @@
 #define PCID            4
 /* This table is filled in by interrogating the PIIX4 chip */
-static char pci_irq[5] __initdata;
+static char pci_irq[5] __devinitdata = {
+};
 static char irq_tab[][5] __initdata = {
        /*      INTA    INTB    INTC    INTD */
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
index b2d4f492d78..9cb9d43a3a0 100644
--- a/arch/mips/sni/a20r.c
+++ b/arch/mips/sni/a20r.c
@@ -118,26 +118,6 @@ static struct resource sc26xx_rsrc[] = {
        }
 };
-static unsigned int sc26xx_data[2] = {
-        /* DTR   |   RTS    |   DSR    |   CTS     |   DCD     |   RI    */
-        (8 << 0) | (4 << 4) | (6 << 8) | (0 << 12) | (6 << 16) | (0 << 20),
-        (3 << 0) | (2 << 4) | (1 << 8) | (2 << 12) | (3 << 16) | (4 << 20)
-};
-static struct platform_device sc26xx_pdev = {
-        .name           = "SC26xx",
-        .num_resources  = ARRAY_SIZE(sc26xx_rsrc),
-        .resource       = sc26xx_rsrc,
-        .dev                    = {
-                .platform_data  = sc26xx_data,
-        }
-};
-#warning "Please try migrate to use new driver SCCNXP and report the status" \
-         "in the linux-serial mailing list."
-/* The code bellow is a replacement of SC26XX to SCCNXP */
-#if 0
 #include <linux/platform_data/sccnxp.h>
 static struct sccnxp_pdata sccnxp_data = {
@@ -155,15 +135,14 @@ static struct sccnxp_pdata sccnxp_data = {
                          MCTRL_SIG(RNG_IP, LINE_IP3),
 };
-static struct platform_device sc2681_pdev = {
+static struct platform_device sc26xx_pdev = {
        .name           = "sc2681",
-        .resource       = sc2xxx_rsrc,
+        .resource       = sc26xx_rsrc,
-        .num_resources  = ARRAY_SIZE(sc2xxx_rsrc),
+        .num_resources  = ARRAY_SIZE(sc26xx_rsrc),
        .dev    = {
                .platform_data  = &sccnxp_data,
        },
 };
-#endif
 static u32 a20r_ack_hwint(void)
 {