[PATCH] v850: Don't reserve root-filesystem memory twice

From: miles@lsi.nec.co.jp (Miles Bader)

This reservation is handled by platform-independent code in 2.6.0, but some
platforms _also_ did it in platform-specific code (left over from 2.4.x).

diff --git a/arch/v850/kernel/as85ep1.c b/arch/v850/kernel/as85ep1.c
index 71b895f6aab7c040b4979e9ad6bd7910be926c07..ccdb7fd23c6128e550bc1ea4bd58c4d8f1cce98c 100644 (file)
--- a/arch/v850/kernel/as85ep1.c
+++ b/arch/v850/kernel/as85ep1.c
@@ -114,22 +114,10 @@ void __init mach_get_physical_ram (unsigned long *ram_start,
 
 void __init mach_reserve_bootmem ()
 {
-       extern char _root_fs_image_start, _root_fs_image_end;
-       u32 root_fs_image_start = (u32)&_root_fs_image_start;
-       u32 root_fs_image_end = (u32)&_root_fs_image_end;
-
        if (SDRAM_ADDR < RAM_END && SDRAM_ADDR > RAM_START)
                /* We can't use the space between SRAM and SDRAM, so
                   prevent the kernel from trying.  */
                reserve_bootmem (SRAM_END, SDRAM_ADDR - SRAM_END);
-
-       /* Reserve the memory used by the root filesystem image if it's
-          in RAM.  */
-       if (root_fs_image_end > root_fs_image_start
-           && root_fs_image_start >= RAM_START
-           && root_fs_image_start < RAM_END)
-               reserve_bootmem (root_fs_image_start,
-                                root_fs_image_end - root_fs_image_start);
 }
 
 void mach_gettimeofday (struct timespec *tv)

diff --git a/arch/v850/kernel/rte_me2_cb.c b/arch/v850/kernel/rte_me2_cb.c
index 25ae5f6d01c3f9d099bb07a895ba5076d53628bd..60c07c0a63f078de23164f34542150653e24785b 100644 (file)
--- a/arch/v850/kernel/rte_me2_cb.c
+++ b/arch/v850/kernel/rte_me2_cb.c
@@ -53,19 +53,6 @@ void __init mach_get_physical_ram (unsigned long *ram_start,
        *ram_len = RAM_END - RAM_START;
 }
 
-void __init mach_reserve_bootmem ()
-{
-       extern char _root_fs_image_start, _root_fs_image_end;
-       u32 root_fs_image_start = (u32)&_root_fs_image_start;
-       u32 root_fs_image_end = (u32)&_root_fs_image_end;
-
-       /* Reserve the memory used by the root filesystem image if it's
-          in RAM.  */
-       if (root_fs_image_start >= RAM_START && root_fs_image_start < RAM_END)
-               reserve_bootmem (root_fs_image_start,
-                                root_fs_image_end - root_fs_image_start);
-}
-
 void mach_gettimeofday (struct timespec *tv)
 {
        tv->tv_sec = 0;

diff --git a/arch/v850/kernel/rte_nb85e_cb.c b/arch/v850/kernel/rte_nb85e_cb.c
index 74074fb3a2f45bff3820c6875982c15eb5d3aa58..990b20bffe473e27933a93d72d60cb974ac98bef 100644 (file)
--- a/arch/v850/kernel/rte_nb85e_cb.c
+++ b/arch/v850/kernel/rte_nb85e_cb.c
@@ -54,21 +54,6 @@ void __init mach_get_physical_ram (unsigned long *ram_start,
        *ram_len = SDRAM_SIZE;
 }
 
-void __init mach_reserve_bootmem ()
-{
-       extern char _root_fs_image_start, _root_fs_image_end;
-       u32 root_fs_image_start = (u32)&_root_fs_image_start;
-       u32 root_fs_image_end = (u32)&_root_fs_image_end;
-
-       /* Reserve the memory used by the root filesystem image if it's
-          in SDRAM.  */
-       if (root_fs_image_end > root_fs_image_start
-           && root_fs_image_start >= SDRAM_ADDR
-           && root_fs_image_start < (SDRAM_ADDR + SDRAM_SIZE))
-               reserve_bootmem (root_fs_image_start,
-                                root_fs_image_end - root_fs_image_start);
-}
-
 void mach_gettimeofday (struct timespec *tv)
 {
        tv->tv_sec = 0;

diff --git a/arch/v850/kernel/sim85e2.c b/arch/v850/kernel/sim85e2.c
index d35be73b84450880cfd67fd71ab865c4114a55ab..593998bb897e47caa999bb48b471eaa23b372de8 100644 (file)
--- a/arch/v850/kernel/sim85e2.c
+++ b/arch/v850/kernel/sim85e2.c
@@ -150,21 +150,6 @@ void mach_get_physical_ram (unsigned long *ram_start, unsigned long *ram_len)
        *ram_len = RAM_END - RAM_START;
 }
 
-void __init mach_reserve_bootmem ()
-{
-       extern char _root_fs_image_start, _root_fs_image_end;
-       u32 root_fs_image_start = (u32)&_root_fs_image_start;
-       u32 root_fs_image_end = (u32)&_root_fs_image_end;
-
-       /* Reserve the memory used by the root filesystem image if it's
-          in RAM.  */
-       if (root_fs_image_end > root_fs_image_start
-           && root_fs_image_start >= RAM_START
-           && root_fs_image_start < RAM_END)
-               reserve_bootmem (root_fs_image_start,
-                                root_fs_image_end - root_fs_image_start);
-}
-
 void __init mach_sched_init (struct irqaction *timer_action)
 {
        /* The simulator actually cycles through all interrupts