aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r
diff options
context:
space:
mode:
Diffstat (limited to 'arch/m32r')
-rw-r--r--arch/m32r/kernel/setup.c4
-rw-r--r--arch/m32r/mm/discontig.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index 0e7778be33cc..936205f7aba0 100644
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -196,9 +196,7 @@ static unsigned long __init setup_memory(void)
196 if (LOADER_TYPE && INITRD_START) { 196 if (LOADER_TYPE && INITRD_START) {
197 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { 197 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
198 reserve_bootmem(INITRD_START, INITRD_SIZE); 198 reserve_bootmem(INITRD_START, INITRD_SIZE);
199 initrd_start = INITRD_START ? 199 initrd_start = INITRD_START + PAGE_OFFSET;
200 INITRD_START + PAGE_OFFSET : 0;
201
202 initrd_end = initrd_start + INITRD_SIZE; 200 initrd_end = initrd_start + INITRD_SIZE;
203 printk("initrd:start[%08lx],size[%08lx]\n", 201 printk("initrd:start[%08lx],size[%08lx]\n",
204 initrd_start, INITRD_SIZE); 202 initrd_start, INITRD_SIZE);
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c
index abb34ccd5986..c7efdb0aefc5 100644
--- a/arch/m32r/mm/discontig.c
+++ b/arch/m32r/mm/discontig.c
@@ -105,9 +105,7 @@ unsigned long __init setup_memory(void)
105 if (INITRD_START + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) { 105 if (INITRD_START + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) {
106 reserve_bootmem_node(NODE_DATA(0), INITRD_START, 106 reserve_bootmem_node(NODE_DATA(0), INITRD_START,
107 INITRD_SIZE); 107 INITRD_SIZE);
108 initrd_start = INITRD_START ? 108 initrd_start = INITRD_START + PAGE_OFFSET;
109 INITRD_START + PAGE_OFFSET : 0;
110
111 initrd_end = initrd_start + INITRD_SIZE; 109 initrd_end = initrd_start + INITRD_SIZE;
112 printk("initrd:start[%08lx],size[%08lx]\n", 110 printk("initrd:start[%08lx],size[%08lx]\n",
113 initrd_start, INITRD_SIZE); 111 initrd_start, INITRD_SIZE);