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

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

x86: Remove more unmodified io_apic_ops 



io_apic_ops.init() is either NULL, if IO-APIC support is disabled at
compile time or native_io_apic_init_mappings(). No point to have that
as we can achieve the same thing with an empty inline.

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

arch/x86/include/asm/io_apic.h

+3 −3
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ extern void mp_save_irq(struct mpc_intsrc *m); 


extern void disable_ioapic_support(void);



extern void __init native_io_apic_init_mappings(void);

extern void __init io_apic_init_mappings(void);

extern unsigned int native_io_apic_read(unsigned int apic, unsigned int reg);

extern void native_disable_io_apic(void);
@@ -251,9 +251,9 @@ static inline int restore_ioapic_entries(void) 
	return -ENOMEM;

}



static inline void mp_save_irq(struct mpc_intsrc *m) { };

static inline void mp_save_irq(struct mpc_intsrc *m) { }

static inline void disable_ioapic_support(void) { }

#define native_io_apic_init_mappings	NULL

static inline void io_apic_init_mappings(void) { }

#define native_io_apic_read		NULL

#define native_disable_io_apic		NULL

arch/x86/include/asm/x86_init.h

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ struct x86_msi_ops { 
};



struct x86_io_apic_ops {

	void		(*init)   (void);

	unsigned int	(*read)   (unsigned int apic, unsigned int reg);

	void		(*disable)(void);

};

arch/x86/kernel/apic/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2687,7 +2687,7 @@ static struct resource * __init ioapic_setup_resources(void) 
	return res;

}



void __init native_io_apic_init_mappings(void)

void __init io_apic_init_mappings(void)

{

	unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;

	struct resource *ioapic_res;

arch/x86/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -1222,8 +1222,7 @@ void __init setup_arch(char **cmdline_p) 
	init_cpu_to_node();



	init_apic_mappings();

	if (x86_io_apic_ops.init)

		x86_io_apic_ops.init();

	io_apic_init_mappings();



	kvm_guest_init();

arch/x86/kernel/x86_init.c

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev) 
#endif



struct x86_io_apic_ops x86_io_apic_ops = {

	.init			= native_io_apic_init_mappings,

	.read			= native_io_apic_read,

	.disable		= native_disable_io_apic,

};