diff options
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index e6e34c7dcabf..29130970c193 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include <linux/proc_fs.h> | 29 | #include <linux/proc_fs.h> |
30 | #include <linux/efi.h> | ||
31 | #include <linux/memory_hotplug.h> | 30 | #include <linux/memory_hotplug.h> |
32 | #include <linux/initrd.h> | 31 | #include <linux/initrd.h> |
33 | #include <linux/cpumask.h> | 32 | #include <linux/cpumask.h> |
@@ -216,23 +215,6 @@ int page_is_ram(unsigned long pagenr) | |||
216 | int i; | 215 | int i; |
217 | unsigned long addr, end; | 216 | unsigned long addr, end; |
218 | 217 | ||
219 | if (efi_enabled) { | ||
220 | efi_memory_desc_t *md; | ||
221 | void *p; | ||
222 | |||
223 | for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { | ||
224 | md = p; | ||
225 | if (!is_available_memory(md)) | ||
226 | continue; | ||
227 | addr = (md->phys_addr+PAGE_SIZE-1) >> PAGE_SHIFT; | ||
228 | end = (md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) >> PAGE_SHIFT; | ||
229 | |||
230 | if ((pagenr >= addr) && (pagenr < end)) | ||
231 | return 1; | ||
232 | } | ||
233 | return 0; | ||
234 | } | ||
235 | |||
236 | for (i = 0; i < e820.nr_map; i++) { | 218 | for (i = 0; i < e820.nr_map; i++) { |
237 | 219 | ||
238 | if (e820.map[i].type != E820_RAM) /* not usable memory */ | 220 | if (e820.map[i].type != E820_RAM) /* not usable memory */ |