Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Ignore vmlinux.lds generated files
  [MIPS] kgdb: Do not call fixup_exception
  [MIPS] RB532: Do not define registers that are already defined
  [MIPS] IP27: Export symbol pcibus_to_node to modules.
  [MIPS] kgdb: s/(void *)0)/NULL/
  [MIPS] kgdb: smp_call_function's 3rd argument is a pointer.
  [MIPS] TXx9: Fix mips_hpt_frequency initialization
  [MIPS] emma2rh: Fix build error by header file inclusion weeding.
  [MIPS] Jazz: Fix build error by header file inclusion weeding.
  [MIPS] Wire up new syscalls.
  [MIPS] Convert printk statements during kernel setup to use severity levels

12 files changed, 56 insertions, 67 deletions

diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c
index 822a20e21fa4..b6a23ad539f8 100644
--- a/arch/mips/emma2rh/markeins/setup.c
+++ b/arch/mips/emma2rh/markeins/setup.c
@@ -25,23 +25,9 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <linux/initrd.h>
-#include <linux/irq.h>
-#include <linux/ioport.h>
-#include <linux/param.h>        /* for HZ */
-#include <linux/root_dev.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/addrspace.h>
+
 #include <asm/time.h>
-#include <asm/bcache.h>
-#include <asm/irq.h>
 #include <asm/reboot.h>
-#include <asm/traps.h>
-#include <asm/debug.h>
 
 #include <asm/emma2rh/emma2rh.h>
 
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index b59ba6b93cdd..7043f6b9ff3c 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -5,33 +5,22 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996, 1997, 1998, 2001, 07 by Ralf Baechle
+ * Copyright (C) 1996, 1997, 1998, 2001, 07, 08 by Ralf Baechle
  * Copyright (C) 2001 MIPS Technologies, Inc.
  * Copyright (C) 2007 by Thomas Bogendoerfer
  */
 #include <linux/eisa.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/mm.h>
 #include <linux/console.h>
-#include <linux/fb.h>
-#include <linux/pm.h>
 #include <linux/screen_info.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
 #include <asm/jazz.h>
 #include <asm/jazzdma.h>
 #include <asm/reboot.h>
-#include <asm/io.h>
 #include <asm/pgtable.h>
-#include <asm/time.h>
-#include <asm/traps.h>
-#include <asm/mc146818-time.h>
 
 extern asmlinkage void jazz_handle_int(void);
 
diff --git a/arch/mips/kernel/.gitignore b/arch/mips/kernel/.gitignore
new file mode 100644
index 000000000000..c5f676c3c224
--- /dev/null
+++ b/arch/mips/kernel/.gitignore
@@ -0,0 +1 @@
+vmlinux.lds
diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c
index c5a8b2d21ca4..8f6d58ede33c 100644
--- a/arch/mips/kernel/kgdb.c
+++ b/arch/mips/kernel/kgdb.c
@@ -62,13 +62,13 @@ void arch_kgdb_breakpoint(void)
 
 static void kgdb_call_nmi_hook(void *ignored)
 {
-        kgdb_nmicallback(raw_smp_processor_id(), (void *)0);
+        kgdb_nmicallback(raw_smp_processor_id(), NULL);
 }
 
 void kgdb_roundup_cpus(unsigned long flags)
 {
         local_irq_enable();
-        smp_call_function(kgdb_call_nmi_hook, NULL, NULL);
+        smp_call_function(kgdb_call_nmi_hook, NULL, 0);
         local_irq_disable();
 }
 
@@ -190,9 +190,6 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd,
         struct pt_regs *regs = args->regs;
         int trap = (regs->cp0_cause & 0x7c) >> 2;
 
-        if (fixup_exception(regs))
-                return NOTIFY_DONE;
-
         /* Userpace events, ignore. */
         if (user_mode(regs))
                 return NOTIFY_DONE;
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index fc4fd4d705e2..5e75a316f6b1 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -647,6 +647,12 @@ einval:	li	v0, -EINVAL
         sys     sys_timerfd_create      2
         sys     sys_timerfd_gettime     2
         sys     sys_timerfd_settime     4
+        sys     sys_signalfd4           4
+        sys     sys_eventfd2            2       /* 4325 */
+        sys     sys_epoll_create1       1
+        sys     sys_dup3                3
+        sys     sys_pipe2               2
+        sys     sys_inotify_init1       1
         .endm
 
         /* We pre-compute the number of _instruction_ bytes needed to
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 2b73fd1e4528..3d58204c9d44 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -481,4 +481,10 @@ sys_call_table:
         PTR     sys_timerfd_create              /* 5280 */
         PTR     sys_timerfd_gettime
         PTR     sys_timerfd_settime
+        PTR     sys_signalfd4
+        PTR     sys_eventfd2
+        PTR     sys_epoll_create1               /* 5285 */
+        PTR     sys_dup3
+        PTR     sys_pipe2
+        PTR     sys_inotify_init1
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 2654e75d2fef..da7f1b6ea0fb 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -407,4 +407,10 @@ EXPORT(sysn32_call_table)
         PTR     sys_timerfd_create
         PTR     sys_timerfd_gettime             /* 5285 */
         PTR     sys_timerfd_settime
+        PTR     sys_signalfd4
+        PTR     sys_eventfd2
+        PTR     sys_epoll_create1
+        PTR     sys_dup3                        /* 5290 */
+        PTR     sys_pipe2
+        PTR     sys_inotify_init1
         .size   sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 76167bea5a70..d7cd1aac9ada 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -529,4 +529,10 @@ sys_call_table:
         PTR     sys_timerfd_create
         PTR     sys_timerfd_gettime
         PTR     sys_timerfd_settime
+        PTR     compat_sys_signalfd4
+        PTR     sys_eventfd2                    /* 4325 */
+        PTR     sys_epoll_create1
+        PTR     sys_dup3
+        PTR     sys_pipe2
+        PTR     sys_inotify_init1
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 8af84867e74d..2aae76bce293 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type)
 
         /* Sanity check */
         if (start + size < start) {
-                printk("Trying to add an invalid memory region, skipped\n");
+                pr_warning("Trying to add an invalid memory region, skipped\n");
                 return;
         }
 
@@ -92,7 +92,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type)
         }
 
         if (x == BOOT_MEM_MAP_MAX) {
-                printk("Ooops! Too many entries in the memory map!\n");
+                pr_err("Ooops! Too many entries in the memory map!\n");
                 return;
         }
 
@@ -108,22 +108,22 @@ static void __init print_memory_map(void)
         const int field = 2 * sizeof(unsigned long);
 
         for (i = 0; i < boot_mem_map.nr_map; i++) {
-                printk(" memory: %0*Lx @ %0*Lx ",
+                printk(KERN_INFO " memory: %0*Lx @ %0*Lx ",
                        field, (unsigned long long) boot_mem_map.map[i].size,
                        field, (unsigned long long) boot_mem_map.map[i].addr);
 
                 switch (boot_mem_map.map[i].type) {
                 case BOOT_MEM_RAM:
-                        printk("(usable)\n");
+                        printk(KERN_CONT "(usable)\n");
                         break;
                 case BOOT_MEM_ROM_DATA:
-                        printk("(ROM data)\n");
+                        printk(KERN_CONT "(ROM data)\n");
                         break;
                 case BOOT_MEM_RESERVED:
-                        printk("(reserved)\n");
+                        printk(KERN_CONT "(reserved)\n");
                         break;
                 default:
-                        printk("type %lu\n", boot_mem_map.map[i].type);
+                        printk(KERN_CONT "type %lu\n", boot_mem_map.map[i].type);
                         break;
                 }
         }
@@ -185,11 +185,11 @@ static unsigned long __init init_initrd(void)
 
 sanitize:
         if (initrd_start & ~PAGE_MASK) {
-                printk(KERN_ERR "initrd start must be page aligned\n");
+                pr_err("initrd start must be page aligned\n");
                 goto disable;
         }
         if (initrd_start < PAGE_OFFSET) {
-                printk(KERN_ERR "initrd start < PAGE_OFFSET\n");
+                pr_err("initrd start < PAGE_OFFSET\n");
                 goto disable;
         }
 
@@ -221,18 +221,18 @@ static void __init finalize_initrd(void)
                 goto disable;
         }
         if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) {
-                printk("Initrd extends beyond end of memory");
+                printk(KERN_ERR "Initrd extends beyond end of memory");
                 goto disable;
         }
 
         reserve_bootmem(__pa(initrd_start), size, BOOTMEM_DEFAULT);
         initrd_below_start_ok = 1;
 
-        printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n",
-               initrd_start, size);
+        pr_info("Initial ramdisk at: 0x%lx (%lu bytes)\n",
+                initrd_start, size);
         return;
 disable:
-        printk(" - disabling initrd\n");
+        printk(KERN_CONT " - disabling initrd\n");
         initrd_start = 0;
         initrd_end = 0;
 }
@@ -310,14 +310,12 @@ static void __init bootmem_init(void)
         if (min_low_pfn >= max_low_pfn)
                 panic("Incorrect memory mapping !!!");
         if (min_low_pfn > ARCH_PFN_OFFSET) {
-                printk(KERN_INFO
-                       "Wasting %lu bytes for tracking %lu unused pages\n",
-                       (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page),
-                       min_low_pfn - ARCH_PFN_OFFSET);
+                pr_info("Wasting %lu bytes for tracking %lu unused pages\n",
+                        (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page),
+                        min_low_pfn - ARCH_PFN_OFFSET);
         } else if (min_low_pfn < ARCH_PFN_OFFSET) {
-                printk(KERN_INFO
-                       "%lu free pages won't be used\n",
-                       ARCH_PFN_OFFSET - min_low_pfn);
+                pr_info("%lu free pages won't be used\n",
+                        ARCH_PFN_OFFSET - min_low_pfn);
         }
         min_low_pfn = ARCH_PFN_OFFSET;
 
@@ -471,7 +469,7 @@ static void __init arch_mem_init(char **cmdline_p)
         /* call board setup routine */
         plat_mem_setup();
 
-        printk("Determined physical RAM map:\n");
+        pr_info("Determined physical RAM map:\n");
         print_memory_map();
 
         strlcpy(command_line, arcs_cmdline, sizeof(command_line));
@@ -482,7 +480,7 @@ static void __init arch_mem_init(char **cmdline_p)
         parse_early_param();
 
         if (usermem) {
-                printk("User-defined physical RAM map:\n");
+                pr_info("User-defined physical RAM map:\n");
                 print_memory_map();
         }
 
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index ce92f82b16d2..bd78368c82bf 100644
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -205,6 +205,7 @@ int pcibus_to_node(struct pci_bus *bus)
 
         return bc->nasid;
 }
+EXPORT_SYMBOL(pcibus_to_node);
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3,
         pci_fixup_ioc3);
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 44fb0a62877f..82ab395efa33 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -49,8 +49,6 @@
 #define GPIO_ALE (1 << 0x0a)
 #define GPIO_CLE (1 << 0x0b)
 
-extern char *board_type;
-
 static struct resource korina_dev0_res[] = {
         {
                 .name = "korina_regs",
@@ -265,14 +263,6 @@ static void __init parse_mac_addr(char *macstr)
 }
 
 
-/* DEVICE CONTROLLER 1 */
-#define CFG_DC_DEV1     ((void *)0xb8010010)
-#define CFG_DC_DEV2     ((void *)0xb8010020)
-#define CFG_DC_DEVBASE    0x0
-#define CFG_DC_DEVMASK    0x4
-#define CFG_DC_DEVC       0x8
-#define CFG_DC_DEVTC      0xC
-
 /* NAND definitions */
 #define NAND_CHIP_DELAY 25
 
@@ -301,16 +291,16 @@ static void __init rb532_nand_setup(void)
 static int __init plat_setup_devices(void)
 {
         /* Look for the CF card reader */
-        if (!readl(CFG_DC_DEV1 + CFG_DC_DEVMASK))
+        if (!readl(IDT434_REG_BASE + DEV1MASK))
                 rb532_devs[1] = NULL;
         else {
                 cf_slot0_res[0].start =
-                    readl(CFG_DC_DEV1 + CFG_DC_DEVBASE);
+                    readl(IDT434_REG_BASE + DEV1BASE);
                 cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000;
         }
 
         /* Read the NAND resources from the device controller */
-        nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE);
+        nand_slot0_res[0].start = readl(IDT434_REG_BASE + DEV2BASE);
         nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;
 
         /* Initialise the NAND device */
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 1bc57d0f4c5c..0afe94c48fb6 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -328,6 +328,9 @@ void __init arch_init_irq(void)
 
 void __init plat_time_init(void)
 {
+#ifdef CONFIG_CPU_TX49XX
+        mips_hpt_frequency = txx9_cpu_clock / 2;
+#endif
         txx9_board_vec->time_init();
 }