From: Andrew Morton Cc: Edgar Hucek Signed-off-by: Andrew Morton --- arch/i386/kernel/setup.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff -puN arch/i386/kernel/setup.c~add-efi-e820-memory-mapping-on-x86-tidy arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c~add-efi-e820-memory-mapping-on-x86-tidy +++ a/arch/i386/kernel/setup.c @@ -1331,12 +1331,12 @@ void __init efi_init_e820_map(void) e820.nr_map = 0; - for (p = memmap.map; p < memmap.map_end; - p += memmap.desc_size) { + for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { md = p; switch (md->type) { case EFI_ACPI_RECLAIM_MEMORY: - add_memory_region(md->phys_addr, md->num_pages << EFI_PAGE_SHIFT, E820_ACPI); + add_memory_region(md->phys_addr, + md->num_pages << EFI_PAGE_SHIFT, E820_ACPI); break; case EFI_RUNTIME_SERVICES_CODE: case EFI_RUNTIME_SERVICES_DATA: @@ -1344,7 +1344,8 @@ void __init efi_init_e820_map(void) case EFI_MEMORY_MAPPED_IO: case EFI_MEMORY_MAPPED_IO_PORT_SPACE: case EFI_UNUSABLE_MEMORY: - add_memory_region(md->phys_addr, md->num_pages << EFI_PAGE_SHIFT, E820_RESERVED); + add_memory_region(md->phys_addr, + md->num_pages << EFI_PAGE_SHIFT, E820_RESERVED); break; case EFI_LOADER_CODE: case EFI_LOADER_DATA: @@ -1356,7 +1357,8 @@ void __init efi_init_e820_map(void) end = start + size; if (start < 0x100000ULL && end > 0xA0000ULL) { if (start < 0xA0000ULL) - add_memory_region(start, 0xA0000ULL-start, E820_RAM); + add_memory_region(start, + 0xA0000ULL-start, E820_RAM); if (end <= 0x100000ULL) continue; start = 0x100000ULL; @@ -1365,7 +1367,8 @@ void __init efi_init_e820_map(void) add_memory_region(start, size, E820_RAM); break; case EFI_ACPI_MEMORY_NVS: - add_memory_region(md->phys_addr, md->num_pages << EFI_PAGE_SHIFT, E820_NVS); + add_memory_region(md->phys_addr, + md->num_pages << EFI_PAGE_SHIFT, E820_NVS); break; } } _