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

Commit 46095865 authored by Juergen Gross's avatar Juergen Gross Committed by Thomas Gleixner
Browse files

x86/paravirt: Remove unused pv_apic_ops structure 



The only member of that structure is startup_ipi_hook which is always
set to paravirt_nop.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Cc: jeremy@goop.org
Cc: chrisw@sous-sol.org
Cc: akataria@vmware.com
Cc: rusty@rustcorp.com.au
Cc: virtualization@lists.linux-foundation.org
Cc: xen-devel@lists.xen.org
Cc: konrad.wilk@oracle.com
Cc: boris.ostrovsky@oracle.com
Link: http://lkml.kernel.org/r/1447767872-16730-1-git-send-email-jgross@suse.com


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

arch/x86/include/asm/paravirt.h

+0 −9
Original line number Diff line number Diff line
@@ -285,15 +285,6 @@ static inline void slow_down_io(void) 
#endif

}



#ifdef CONFIG_SMP

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

				    unsigned long start_esp)

{

	PVOP_VCALL3(pv_apic_ops.startup_ipi_hook,

		    phys_apicid, start_eip, start_esp);

}

#endif



static inline void paravirt_activate_mm(struct mm_struct *prev,

					struct mm_struct *next)

{

arch/x86/include/asm/paravirt_types.h

+0 −10
Original line number Diff line number Diff line
@@ -215,14 +215,6 @@ struct pv_irq_ops { 
#endif

};



struct pv_apic_ops {

#ifdef CONFIG_X86_LOCAL_APIC

	void (*startup_ipi_hook)(int phys_apicid,

				 unsigned long start_eip,

				 unsigned long start_esp);

#endif

};



struct pv_mmu_ops {

	unsigned long (*read_cr2)(void);

	void (*write_cr2)(unsigned long);
@@ -354,7 +346,6 @@ struct paravirt_patch_template { 
	struct pv_time_ops pv_time_ops;

	struct pv_cpu_ops pv_cpu_ops;

	struct pv_irq_ops pv_irq_ops;

	struct pv_apic_ops pv_apic_ops;

	struct pv_mmu_ops pv_mmu_ops;

	struct pv_lock_ops pv_lock_ops;

};
@@ -364,7 +355,6 @@ extern struct pv_init_ops pv_init_ops; 
extern struct pv_time_ops pv_time_ops;

extern struct pv_cpu_ops pv_cpu_ops;

extern struct pv_irq_ops pv_irq_ops;

extern struct pv_apic_ops pv_apic_ops;

extern struct pv_mmu_ops pv_mmu_ops;

extern struct pv_lock_ops pv_lock_ops;

arch/x86/include/asm/smp.h

+0 −3
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ struct smp_ops { 
extern void set_cpu_sibling_map(int cpu);



#ifdef CONFIG_SMP

#ifndef CONFIG_PARAVIRT

#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)

#endif

extern struct smp_ops smp_ops;



static inline void smp_send_stop(void)

arch/x86/kernel/paravirt.c

+0 −8
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ static void *get_call_destination(u8 type) 
		.pv_time_ops = pv_time_ops,

		.pv_cpu_ops = pv_cpu_ops,

		.pv_irq_ops = pv_irq_ops,

		.pv_apic_ops = pv_apic_ops,

		.pv_mmu_ops = pv_mmu_ops,

#ifdef CONFIG_PARAVIRT_SPINLOCKS

		.pv_lock_ops = pv_lock_ops,
@@ -392,12 +391,6 @@ NOKPROBE_SYMBOL(native_get_debugreg); 
NOKPROBE_SYMBOL(native_set_debugreg);

NOKPROBE_SYMBOL(native_load_idt);



struct pv_apic_ops pv_apic_ops = {

#ifdef CONFIG_X86_LOCAL_APIC

	.startup_ipi_hook = paravirt_nop,

#endif

};



#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)

/* 32-bit pagetable entries */

#define PTE_IDENT	__PV_IS_CALLEE_SAVE(_paravirt_ident_32)
@@ -481,6 +474,5 @@ struct pv_mmu_ops pv_mmu_ops = { 
EXPORT_SYMBOL_GPL(pv_time_ops);

EXPORT_SYMBOL    (pv_cpu_ops);

EXPORT_SYMBOL    (pv_mmu_ops);

EXPORT_SYMBOL_GPL(pv_apic_ops);

EXPORT_SYMBOL_GPL(pv_info);

EXPORT_SYMBOL    (pv_irq_ops);

arch/x86/kernel/smpboot.c

+0 −7
Original line number Diff line number Diff line
@@ -628,13 +628,6 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip) 
	else

		num_starts = 0;



	/*

	 * Paravirt / VMI wants a startup IPI hook here to set up the

	 * target processor state.

	 */

	startup_ipi_hook(phys_apicid, (unsigned long) start_secondary,

			 stack_start);



	/*

	 * Run STARTUP IPI loop.

	 */