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

Commit 6b18ae3e authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Move memory_setup to x86_init_ops 



memory_setup is overridden by x86_quirks and by paravirts with weak
functions and quirks. Unify the whole mess and make it an
unconditional x86_init_ops function which defaults to the standard
function and can be overridden by the early platform code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 816c25e7

arch/x86/include/asm/e820.h

+0 −2
Original line number Diff line number Diff line
@@ -126,8 +126,6 @@ extern void e820_reserve_resources(void); 
extern void e820_reserve_resources_late(void);

extern void setup_memory_map(void);

extern char *default_machine_specific_memory_setup(void);

extern char *machine_specific_memory_setup(void);

extern char *memory_setup(void);

#endif /* __KERNEL__ */

#endif /* __ASSEMBLY__ */

arch/x86/include/asm/paravirt_types.h

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ struct pv_init_ops { 


	/* Basic arch-specific setup */

	void (*arch_setup)(void);

	char *(*memory_setup)(void);

	void (*post_allocator_init)(void);



	/* Print a banner to identify the environment */

arch/x86/include/asm/setup.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ struct x86_quirks { 
	int (*arch_pre_intr_init)(void);

	int (*arch_intr_init)(void);

	int (*arch_trap_init)(void);

	char * (*arch_memory_setup)(void);

	int (*mach_get_smp_config)(unsigned int early);

	int (*mach_find_smp_config)(unsigned int reserve);

arch/x86/include/asm/x86_init.h

+2 −0
Original line number Diff line number Diff line
@@ -7,12 +7,14 @@ 
 * @reserve_resources:		reserve the standard resources for the

 *				platform

 * @reserve_ebda_region:	reserve the extended bios data area

 * @memory_setup:		platform specific memory setup

 *

 */

struct x86_init_resources {

	void (*probe_roms)(void);

	void (*reserve_resources)(void);

	void (*reserve_ebda_region)(void);

	char *(*memory_setup)(void);

};



/**

arch/x86/kernel/apic/numaq_32.c

+0 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = { 
	.arch_pre_time_init		= numaq_pre_time_init,

	.arch_time_init			= NULL,

	.arch_pre_intr_init		= NULL,

	.arch_memory_setup		= NULL,

	.arch_intr_init			= NULL,

	.arch_trap_init			= NULL,

	.mach_get_smp_config		= NULL,