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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (53 commits)
  [MIPS] sparsemem: fix crash in show_mem
  [MIPS] vr41xx: Update workpad setup function
  [MIPS] vr41xx: Update e55 setup function
  [MIPS] vr41xx: Removed old v2.4 VRC4173 driver
  [MIPS] vr41xx: Move IRQ numbers to asm-mips/vr41xx/irq.h
  [MIPS] MIPSsim: Build fix, rename sim_timer_setup -> plat_timer_setup.
  [MIPS] Remove unused code.
  [MIPS] IP22 Fix brown paper bag in RTC code.
  [MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init().
  [MIPS] Replace board_timer_setup function pointer by plat_timer_setup.
  [MIPS] Nuke redeclarations of board_time_init.
  [MIPS] Remove redeclarations of setup_irq().
  [MIPS] Nuke redeclarations of board_timer_setup.
  [MIPS] Print out TLB handler assembly for debugging.
  [MIPS] SMTC: Reformat to Linux style.
  [MIPS] MIPSsim: Delete redeclaration of ll_local_timer_interrupt.
  [MIPS] IP27: Reformatting.
  [MIPS] IP27: Invoke setup_irq for timer interrupt so proc stats will be shown.
  [MIPS] IP27: irq_chip startup method returns unsigned int.
  [MIPS] IP27: struct irq_desc member handler was renamed to chip.
  ...

2 files changed, 28 insertions, 30 deletions

diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index c89fcf9e9c22..be80c5dd4a0c 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -47,43 +47,45 @@ static char *mtypes[3] = {
 };
 #endif
 
+/* determined physical memory size, not overridden by command line args  */
+unsigned long physical_memsize = 0L;
+
 struct prom_pmemblock * __init prom_getmdesc(void)
 {
         char *memsize_str;
         unsigned int memsize;
         char cmdline[CL_SIZE], *ptr;
 
-        /* Check the command line first for a memsize directive */
-        strcpy(cmdline, arcs_cmdline);
-        ptr = strstr(cmdline, "memsize=");
-        if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
-                ptr = strstr(ptr, " memsize=");
-
-        if (ptr) {
-                memsize = memparse(ptr + 8, &ptr);
-        }
-        else {
-                /* otherwise look in the environment */
-                memsize_str = prom_getenv("memsize");
-                if (!memsize_str) {
-                        prom_printf("memsize not set in boot prom, set to default (32Mb)\n");
-                        memsize = 0x02000000;
-                } else {
+        /* otherwise look in the environment */
+        memsize_str = prom_getenv("memsize");
+        if (!memsize_str) {
+                prom_printf("memsize not set in boot prom, set to default (32Mb)\n");
+                physical_memsize = 0x02000000;
+        } else {
 #ifdef DEBUG
-                        prom_printf("prom_memsize = %s\n", memsize_str);
+                prom_printf("prom_memsize = %s\n", memsize_str);
 #endif
-                        memsize = simple_strtol(memsize_str, NULL, 0);
-                }
+                physical_memsize = simple_strtol(memsize_str, NULL, 0);
         }
 
 #ifdef CONFIG_CPU_BIG_ENDIAN
-        /*
-         * SOC-it swaps, or perhaps doesn't swap, when DMA'ing the last
-         * word of physical memory
-         */
-        memsize -= PAGE_SIZE;
+        /* SOC-it swaps, or perhaps doesn't swap, when DMA'ing the last
+           word of physical memory */
+        physical_memsize -= PAGE_SIZE;
 #endif
 
+        /* Check the command line for a memsize directive that overrides
+           the physical/default amount */
+        strcpy(cmdline, arcs_cmdline);
+        ptr = strstr(cmdline, "memsize=");
+        if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
+                ptr = strstr(ptr, " memsize=");
+
+        if (ptr)
+                memsize = memparse(ptr + 8, &ptr);
+        else
+                memsize = physical_memsize;
+
         memset(mdesc, 0, sizeof(mdesc));
 
         mdesc[0].type = yamon_dontuse;
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index 5e207760826b..557bf961f36a 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -228,9 +228,7 @@ unsigned long __init mips_rtc_get_time(void)
 
 void __init mips_time_init(void)
 {
-        unsigned int est_freq, flags;
-
-        local_irq_save(flags);
+        unsigned int est_freq;
 
         /* Set Data mode - binary. */
         CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);
@@ -241,11 +239,9 @@ void __init mips_time_init(void)
                (est_freq%1000000)*100/1000000);
 
         cpu_khz = est_freq / 1000;
-
-        local_irq_restore(flags);
 }
 
-void __init mips_timer_setup(struct irqaction *irq)
+void __init plat_timer_setup(struct irqaction *irq)
 {
         if (cpu_has_veic) {
                 set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);