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

Commit f1d7062a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Move xen_post_allocator_init into xen_pagetable_setup_done 



We really do not need two paravirt/x86_init_ops functions which are
called in two consecutive source lines. Move the only user of
post_allocator_init into the already existing pagetable_setup_done
function.

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

arch/x86/include/asm/paravirt.h

+0 −6
Original line number Diff line number Diff line
@@ -345,12 +345,6 @@ static inline void setup_secondary_clock(void) 
}

#endif



static inline void paravirt_post_allocator_init(void)

{

	if (pv_init_ops.post_allocator_init)

		(*pv_init_ops.post_allocator_init)();

}



#ifdef CONFIG_SMP

static inline void startup_ipi_hook(int phys_apicid, unsigned long start_eip,

				    unsigned long start_esp)

arch/x86/include/asm/paravirt_types.h

+0 −3
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ struct pv_init_ops { 
	 */

	unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,

			  unsigned long addr, unsigned len);



	/* Basic arch-specific setup */

	void (*post_allocator_init)(void);

};

arch/x86/include/asm/setup.h

+0 −4
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ static inline int is_visws_box(void) { return 0; } 
extern struct x86_quirks *x86_quirks;

extern unsigned long saved_video_mode;



#ifndef CONFIG_PARAVIRT

#define paravirt_post_allocator_init()	do {} while (0)

#endif



extern void reserve_standard_io_resources(void);

extern void i386_reserve_resources(void);

arch/x86/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -962,7 +962,6 @@ void __init setup_arch(char **cmdline_p) 
	x86_init.paging.pagetable_setup_start(swapper_pg_dir);

	paging_init();

	x86_init.paging.pagetable_setup_done(swapper_pg_dir);

	paravirt_post_allocator_init();



#ifdef CONFIG_X86_64

	map_vsyscall();

arch/x86/xen/enlighten.c

+0 −2
Original line number Diff line number Diff line
@@ -839,8 +839,6 @@ static const struct pv_info xen_info __initdata = { 


static const struct pv_init_ops xen_init_ops __initdata = {

	.patch = xen_patch,



	.post_allocator_init = xen_post_allocator_init,

};



static const struct pv_time_ops xen_time_ops __initdata = {