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

Commit 257b0fde authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: move parse_setup_data back to setup.c 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 217b8ce8

arch/x86/kernel/setup.c

+25 −0
Original line number Diff line number Diff line
@@ -375,6 +375,31 @@ static void __init reserve_initrd(void) 
}

#endif /* CONFIG_BLK_DEV_INITRD */



void __init parse_setup_data(void)

{

	struct setup_data *data;

	u64 pa_data;



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, PAGE_SIZE);

		switch (data->type) {

		case SETUP_E820_EXT:

			parse_e820_ext(data, pa_data);

			break;

		default:

			break;

		}

#ifndef CONFIG_DEBUG_BOOT_PARAMS

		free_early(pa_data, pa_data+sizeof(*data)+data->len);

#endif

		pa_data = data->next;

		early_iounmap(data, PAGE_SIZE);

	}

}



/*

 * Determine if we were loaded by an EFI loader.  If so, then we have also been

 * passed the efi memmap, systab, etc., so we should use these data structures

arch/x86/kernel/setup_percpu.c

+0 −25
Original line number Diff line number Diff line
@@ -214,31 +214,6 @@ void __init setup_per_cpu_areas(void) 


#endif



void __init parse_setup_data(void)

{

	struct setup_data *data;

	u64 pa_data;



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, PAGE_SIZE);

		switch (data->type) {

		case SETUP_E820_EXT:

			parse_e820_ext(data, pa_data);

			break;

		default:

			break;

		}

#ifndef CONFIG_DEBUG_BOOT_PARAMS

		free_early(pa_data, pa_data+sizeof(*data)+data->len);

#endif

		pa_data = data->next;

		early_iounmap(data, PAGE_SIZE);

	}

}



#ifdef X86_64_NUMA



/*