[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/18] x86: remove commented out stale references to efi_enabled
From: |
Daniel Kiper |
Subject: |
[PATCH 06/18] x86: remove commented out stale references to efi_enabled |
Date: |
Fri, 30 Jan 2015 18:54:10 +0100 |
Signed-off-by: Daniel Kiper <address@hidden>
---
xen/arch/x86/e820.c | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c
index bf84bae..47920a3 100644
--- a/xen/arch/x86/e820.c
+++ b/xen/arch/x86/e820.c
@@ -74,20 +74,18 @@ static void __init add_memory_region(unsigned long long
start,
{
int x;
- /*if (!efi_enabled)*/ {
- x = e820.nr_map;
+ x = e820.nr_map;
- if (x == E820MAX) {
- printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
- return;
- }
-
- e820.map[x].addr = start;
- e820.map[x].size = size;
- e820.map[x].type = type;
- e820.nr_map++;
+ if (x == E820MAX) {
+ printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
+ return;
}
-} /* add_memory_region */
+
+ e820.map[x].addr = start;
+ e820.map[x].size = size;
+ e820.map[x].type = type;
+ e820.nr_map++;
+}
static void __init print_e820_memory_map(struct e820entry *map, unsigned int
entries)
{
@@ -349,13 +347,6 @@ static unsigned long __init find_max_pfn(void)
int i;
unsigned long max_pfn = 0;
-#if 0
- if (efi_enabled) {
- efi_memmap_walk(efi_find_max_pfn, &max_pfn);
- return;
- }
-#endif
-
for (i = 0; i < e820.nr_map; i++) {
unsigned long start, end;
/* RAM? */
--
1.7.10.4
- [PATCH 00/18] x86: multiboot2 protocol support, Daniel Kiper, 2015/01/30
- [PATCH 01/18] x86/boot/reloc: mask out MBI_BOOTDEV from mbi flags, Daniel Kiper, 2015/01/30
- [PATCH 02/18] x86/boot/reloc: create generic alloc and copy functions, Daniel Kiper, 2015/01/30
- [PATCH 03/18] x86/boot: use %ecx instead of %eax, Daniel Kiper, 2015/01/30
- [PATCH 04/18] xen/x86: add multiboot2 protocol support, Daniel Kiper, 2015/01/30
- [PATCH 05/18] efi: split efi_enabled to efi_platform and efi_loader, Daniel Kiper, 2015/01/30
- [PATCH 06/18] x86: remove commented out stale references to efi_enabled,
Daniel Kiper <=
- [PATCH 08/18] efi: build xen.gz with EFI code, Daniel Kiper, 2015/01/30
- [PATCH 07/18] efi: run EFI specific code on EFI platform only, Daniel Kiper, 2015/01/30
- [PATCH 12/18] efi: create efi_find_gop_mode(), Daniel Kiper, 2015/01/30
- [PATCH 09/18] efi: create efi_init(), Daniel Kiper, 2015/01/30
- [PATCH 10/18] efi: create efi_console_set_mode(), Daniel Kiper, 2015/01/30
- [PATCH 11/18] efi: create efi_get_gop(), Daniel Kiper, 2015/01/30
- [PATCH 13/18] efi: create efi_tables(), Daniel Kiper, 2015/01/30
- [PATCH 14/18] efi: create efi_variables(), Daniel Kiper, 2015/01/30
- [PATCH 16/18] efi: create efi_exit_boot(), Daniel Kiper, 2015/01/30
- [PATCH 15/18] efi: create efi_set_gop_mode(), Daniel Kiper, 2015/01/30