Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh

* 'sh-latest' of git://github.com/pmundt/linux-sh:
  sh: Add default uImage rule for sh7757lcr
  sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr
  sh: userimask.c needs linux/stat.h
  sh: pfc: Add GPIO IRQ support
  sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards
  sh: pfc: Remove unused gpio_in_use member
  sh: add parameters for EHCI and RIIC in clock-sh7757.c
  sh: kexec: Add PHYSICAL_START
  SH: irq: Remove IRQF_DISABLED
  sh: pfc: get_config_reg() shift clean up
  sh: intc: Add IRQ trigger bit field check
  sh: drop unused Kconfig symbol
  sh: Fix implicit declaration of function numa_node_id
  sh: kexec: Register crashk_res
  sh: ecovec: add renesas_usbhs DMAEngine support

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 58a93fb3d965..c9dbace35b16 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -287,6 +287,8 @@ static void __init do_init_bootmem(void)
 static void __init early_reserve_mem(void)
 {
         unsigned long start_pfn;
+        u32 zero_base = (u32)__MEMORY_START + (u32)PHYSICAL_OFFSET;
+        u32 start = zero_base + (u32)CONFIG_ZERO_PAGE_OFFSET;
 
         /*
          * Partially used pages are not usable - thus
@@ -300,15 +302,13 @@ static void __init early_reserve_mem(void)
          * this catches the (definitely buggy) case of us accidentally
          * initializing the bootmem allocator with an invalid RAM area.
          */
-        memblock_reserve(__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET,
-                    (PFN_PHYS(start_pfn) + PAGE_SIZE - 1) -
-                    (__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET));
+        memblock_reserve(start, (PFN_PHYS(start_pfn) + PAGE_SIZE - 1) - start);
 
         /*
          * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET.
          */
         if (CONFIG_ZERO_PAGE_OFFSET != 0)
-                memblock_reserve(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET);
+                memblock_reserve(zero_base, CONFIG_ZERO_PAGE_OFFSET);
 
         /*
          * Handle additional early reservations