Commit 61a50101 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/boot/e820: Rename everything to e820_table 



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 acd4c048

Documentation/x86/zero-page.txt

+2 −2
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ Offset Proto Name Meaning 
1C0/020	ALL	efi_info	EFI 32 information (struct efi_info)

1E0/004	ALL	alk_mem_k	Alternative mem check, in KB

1E4/004	ALL	scratch		Scratch field for the kernel setup code

1E8/001	ALL	e820_entries	Number of entries in e820_array (below)

1E8/001	ALL	e820_entries	Number of entries in e820_table (below)

1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)

1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer

				(below)

1EF/001	ALL	sentinel	Used to detect broken bootloaders

290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures

2D0/A00	ALL	e820_array	E820 memory map table

2D0/A00	ALL	e820_table	E820 memory map table

				(array of struct e820_entry)

D00/1EC	ALL	eddbuf		EDD data (array of struct edd_info)

arch/x86/boot/compressed/eboot.c

+11 −11
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ static void add_e820ext(struct boot_params *params, 
static efi_status_t setup_e820(struct boot_params *params,

			       struct setup_data *e820ext, u32 e820ext_size)

{

	struct e820_entry *e820_array = &params->e820_array[0];

	struct e820_entry *e820_table = &params->e820_table[0];

	struct efi_info *efi = &params->efi_info;

	struct e820_entry *prev = NULL;

	u32 nr_entries;
@@ -982,7 +982,7 @@ static efi_status_t setup_e820(struct boot_params *params, 
			continue;

		}



		if (nr_entries == ARRAY_SIZE(params->e820_array)) {

		if (nr_entries == ARRAY_SIZE(params->e820_table)) {

			u32 need = (nr_desc - i) * sizeof(struct e820_entry) +

				   sizeof(struct setup_data);
@@ -990,18 +990,18 @@ static efi_status_t setup_e820(struct boot_params *params, 
				return EFI_BUFFER_TOO_SMALL;



			/* boot_params map full, switch to e820 extended */

			e820_array = (struct e820_entry *)e820ext->data;

			e820_table = (struct e820_entry *)e820ext->data;

		}



		e820_array->addr = d->phys_addr;

		e820_array->size = d->num_pages << PAGE_SHIFT;

		e820_array->type = e820_type;

		prev = e820_array++;

		e820_table->addr = d->phys_addr;

		e820_table->size = d->num_pages << PAGE_SHIFT;

		e820_table->type = e820_type;

		prev = e820_table++;

		nr_entries++;

	}



	if (nr_entries > ARRAY_SIZE(params->e820_array)) {

		u32 nr_e820ext = nr_entries - ARRAY_SIZE(params->e820_array);

	if (nr_entries > ARRAY_SIZE(params->e820_table)) {

		u32 nr_e820ext = nr_entries - ARRAY_SIZE(params->e820_table);



		add_e820ext(params, e820ext, nr_e820ext);

		nr_entries -= nr_e820ext;
@@ -1055,9 +1055,9 @@ static efi_status_t exit_boot_func(efi_system_table_t *sys_table_arg, 


	if (first) {

		nr_desc = *map->buff_size / *map->desc_size;

		if (nr_desc > ARRAY_SIZE(p->boot_params->e820_array)) {

		if (nr_desc > ARRAY_SIZE(p->boot_params->e820_table)) {

			u32 nr_e820ext = nr_desc -

					ARRAY_SIZE(p->boot_params->e820_array);

					ARRAY_SIZE(p->boot_params->e820_table);



			status = alloc_e820ext(nr_e820ext, &p->e820ext,

					       &p->e820ext_size);

arch/x86/boot/compressed/kaslr.c

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static unsigned long find_random_phys_addr(unsigned long minimum, 


	/* Verify potential e820 positions, appending to slots list. */

	for (i = 0; i < boot_params->e820_entries; i++) {

		process_e820_entry(&boot_params->e820_array[i], minimum,

		process_e820_entry(&boot_params->e820_table[i], minimum,

				   image_size);

		if (slot_area_index == MAX_SLOT_AREA) {

			debug_putstr("Aborted e820 scan (slot_areas full)!\n");

arch/x86/boot/memory.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int detect_memory_e820(void) 
{

	int count = 0;

	struct biosregs ireg, oreg;

	struct e820_entry *desc = boot_params.e820_array;

	struct e820_entry *desc = boot_params.e820_table;

	static struct e820_entry buf; /* static so it is zeroed */



	initregs(&ireg);
@@ -66,7 +66,7 @@ static int detect_memory_e820(void) 


		*desc++ = buf;

		count++;

	} while (ireg.ebx && count < ARRAY_SIZE(boot_params.e820_array));

	} while (ireg.ebx && count < ARRAY_SIZE(boot_params.e820_table));



	return boot_params.e820_entries = count;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
#include <asm/e820/types.h>



/* see comment in arch/x86/kernel/e820.c */

extern struct e820_array *e820_array;

extern struct e820_array *e820_array_saved;

extern struct e820_table *e820_table;

extern struct e820_table *e820_table_saved;



extern unsigned long pci_mem_start;
@@ -13,7 +13,7 @@ extern int e820_any_mapped(u64 start, u64 end, unsigned type); 
extern int  e820_all_mapped(u64 start, u64 end, unsigned type);

extern void e820_add_region(u64 start, u64 size, int type);

extern void e820_print_map(char *who);

extern int  sanitize_e820_array(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map);

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);