Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6464d294 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/boot/e820: Rename update_e820() to e820__update_table() 



update_e820() should have 'e820' as a prefix as most of the other E820
functions have - but it's also a bit unclear about its purpose, as
it's unclear what is updated - the whole table, or an entry?

Also, the name does not express that it's a trivial wrapper
around sanitize_e820_table() that also prints out the resulting
table.

So rename it to e820__update_table_print(). This also makes it
harmonize with the e820__update_table_firmware() function which
has a very similar purpose.

No change in functionality.

Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5da217ca

arch/x86/include/asm/e820/api.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ extern void e820_print_map(char *who); 
extern int  sanitize_e820_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);

extern u64  e820_update_range(u64 start, u64 size, unsigned old_type, unsigned new_type);

extern u64  e820_remove_range(u64 start, u64 size, unsigned old_type, int checktype);

extern void update_e820(void);

extern void e820__update_table_print(void);

extern void e820_setup_gap(void);

extern void e820__memory_setup_extended(u64 phys_addr, u32 data_len);

extern unsigned long e820_end_of_ram_pfn(void);

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -1716,5 +1716,5 @@ int __acpi_release_global_lock(unsigned int *lock) 
void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size)

{

	e820_add_region(addr, size, E820_ACPI);

	update_e820();

	e820__update_table_print();

}

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ void __init early_gart_iommu_check(void) 
			pr_info("e820: reserve [mem %#010Lx-%#010Lx] for GART\n",

				aper_base, aper_base + aper_size - 1);

			e820_add_region(aper_base, aper_size, E820_RESERVED);

			update_e820();

			e820__update_table_print();

		}

	}

arch/x86/kernel/cpu/mtrr/cleanup.c

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn) 
			WARN_ON(1);



		pr_info("update e820 for mtrr\n");

		update_e820();

		e820__update_table_print();



		return 1;

	}

arch/x86/kernel/e820.c

+3 −3
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type, int checkty 
	return real_removed_size;

}



void __init update_e820(void)

void __init e820__update_table_print(void)

{

	if (sanitize_e820_table(e820_table->entries, ARRAY_SIZE(e820_table->entries), &e820_table->nr_entries))

		return;
@@ -555,7 +555,7 @@ void __init update_e820(void) 
	e820_print_map("modified");

}



static void __init update_e820_table_firmware(void)

static void __init e820__update_table_firmware(void)

{

	sanitize_e820_table(e820_table_firmware->entries, ARRAY_SIZE(e820_table_firmware->entries), &e820_table_firmware->nr_entries);

}
@@ -749,7 +749,7 @@ u64 __init e820__memblock_alloc_reserved(u64 size, u64 align) 
	if (addr) {

		e820_update_range_firmware(addr, size, E820_RAM, E820_RESERVED);

		pr_info("e820: update e820_table_firmware for e820__memblock_alloc_reserved()\n");

		update_e820_table_firmware();

		e820__update_table_firmware();

	}



	return addr;