aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-voyager/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/mach-voyager/setup.c')
-rw-r--r--arch/x86/mach-voyager/setup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
index f4aca9fa9546..f27b583154e5 100644
--- a/arch/x86/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
@@ -74,7 +74,7 @@ char *__init machine_specific_memory_setup(void)
74 74
75 e820.nr_map = 0; 75 e820.nr_map = 0;
76 for (i = 0; voyager_memory_detect(i, &addr, &length); i++) { 76 for (i = 0; voyager_memory_detect(i, &addr, &length); i++) {
77 add_memory_region(addr, length, E820_RAM); 77 e820_add_region(addr, length, E820_RAM);
78 } 78 }
79 return who; 79 return who;
80 } else if (voyager_level == 4) { 80 } else if (voyager_level == 4) {
@@ -92,14 +92,14 @@ char *__init machine_specific_memory_setup(void)
92 tom = (boot_params.screen_info.ext_mem_k) << 10; 92 tom = (boot_params.screen_info.ext_mem_k) << 10;
93 } 93 }
94 who = "Voyager-TOM"; 94 who = "Voyager-TOM";
95 add_memory_region(0, 0x9f000, E820_RAM); 95 e820_add_region(0, 0x9f000, E820_RAM);
96 /* map from 1M to top of memory */ 96 /* map from 1M to top of memory */
97 add_memory_region(1 * 1024 * 1024, tom - 1 * 1024 * 1024, 97 e820_add_region(1 * 1024 * 1024, tom - 1 * 1024 * 1024,
98 E820_RAM); 98 E820_RAM);
99 /* FIXME: Should check the ASICs to see if I need to 99 /* FIXME: Should check the ASICs to see if I need to
100 * take out the 8M window. Just do it at the moment 100 * take out the 8M window. Just do it at the moment
101 * */ 101 * */
102 add_memory_region(8 * 1024 * 1024, 8 * 1024 * 1024, 102 e820_add_region(8 * 1024 * 1024, 8 * 1024 * 1024,
103 E820_RESERVED); 103 E820_RESERVED);
104 return who; 104 return who;
105 } 105 }
@@ -131,8 +131,8 @@ char *__init machine_specific_memory_setup(void)
131 } 131 }
132 132
133 e820.nr_map = 0; 133 e820.nr_map = 0;
134 add_memory_region(0, LOWMEMSIZE(), E820_RAM); 134 e820_add_region(0, LOWMEMSIZE(), E820_RAM);
135 add_memory_region(HIGH_MEMORY, mem_size << 10, E820_RAM); 135 e820_add_region(HIGH_MEMORY, mem_size << 10, E820_RAM);
136 } 136 }
137 return who; 137 return who;
138} 138}