diff options
Diffstat (limited to 'arch/x86/mach-default/setup.c')
-rw-r--r-- | arch/x86/mach-default/setup.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c index 0c28a071824c..2f5e277686b8 100644 --- a/arch/x86/mach-default/setup.c +++ b/arch/x86/mach-default/setup.c | |||
@@ -142,45 +142,3 @@ static int __init print_ipi_mode(void) | |||
142 | 142 | ||
143 | late_initcall(print_ipi_mode); | 143 | late_initcall(print_ipi_mode); |
144 | 144 | ||
145 | /** | ||
146 | * machine_specific_memory_setup - Hook for machine specific memory setup. | ||
147 | * | ||
148 | * Description: | ||
149 | * This is included late in kernel/setup.c so that it can make | ||
150 | * use of all of the static functions. | ||
151 | **/ | ||
152 | |||
153 | char * __init machine_specific_memory_setup(void) | ||
154 | { | ||
155 | char *who; | ||
156 | |||
157 | |||
158 | who = "BIOS-e820"; | ||
159 | |||
160 | /* | ||
161 | * Try to copy the BIOS-supplied E820-map. | ||
162 | * | ||
163 | * Otherwise fake a memory map; one section from 0k->640k, | ||
164 | * the next section from 1mb->appropriate_mem_k | ||
165 | */ | ||
166 | sanitize_e820_map(boot_params.e820_map, &boot_params.e820_entries); | ||
167 | if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries) | ||
168 | < 0) { | ||
169 | unsigned long mem_size; | ||
170 | |||
171 | /* compare results from other methods and take the greater */ | ||
172 | if (boot_params.alt_mem_k | ||
173 | < boot_params.screen_info.ext_mem_k) { | ||
174 | mem_size = boot_params.screen_info.ext_mem_k; | ||
175 | who = "BIOS-88"; | ||
176 | } else { | ||
177 | mem_size = boot_params.alt_mem_k; | ||
178 | who = "BIOS-e801"; | ||
179 | } | ||
180 | |||
181 | e820.nr_map = 0; | ||
182 | add_memory_region(0, LOWMEMSIZE(), E820_RAM); | ||
183 | add_memory_region(HIGH_MEMORY, mem_size << 10, E820_RAM); | ||
184 | } | ||
185 | return who; | ||
186 | } | ||