x86/apic: Remove the (now) unused disable_IO_APIC() function (50374b96) · Commits · 戴 / test

arch/x86/include/asm/io_apic.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,6 @@ static inline unsigned int io_apic_read(unsigned int apic, unsigned int reg)

		extern void setup_IO_APIC(void);
		extern void enable_IO_APIC(void);
		extern void disable_IO_APIC(void);
		extern void clear_IO_APIC(void);
		extern void restore_boot_irq_mode(void);
		extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin);

+0 −13

Original line number	Diff line number	Diff line
		@@ -1438,19 +1438,6 @@ void native_disable_io_apic(void)
		disconnect_bsp_APIC(ioapic_i8259.pin != -1);
		}

		/*
		* Not an __init, needed by the reboot code
		*/
		void disable_IO_APIC(void)
		{
		/*
		* Clear the IO-APIC before rebooting:
		*/
		clear_IO_APIC();

		restore_boot_irq_mode();
		}

		void restore_boot_irq_mode(void)
		{
		if (!nr_legacy_irqs())

+2 −3

Original line number	Diff line number	Diff line
		@@ -195,9 +195,8 @@ void machine_kexec(struct kimage *image)
		/*
		* We need to put APICs in legacy mode so that we can
		* get timer interrupts in second kernel. kexec/kdump
		* paths already have calls to disable_IO_APIC() in
		* one form or other. kexec jump path also need
		* one.
		* paths already have calls to restore_boot_irq_mode()
		* in one form or other. kexec jump path also need one.
		*/
		clear_IO_APIC();
		restore_boot_irq_mode();

+2 −3

Original line number	Diff line number	Diff line
		@@ -293,9 +293,8 @@ void machine_kexec(struct kimage *image)
		/*
		* We need to put APICs in legacy mode so that we can
		* get timer interrupts in second kernel. kexec/kdump
		* paths already have calls to disable_IO_APIC() in
		* one form or other. kexec jump path also need
		* one.
		* paths already have calls to restore_boot_irq_mode()
		* in one form or other. kexec jump path also need one.
		*/
		clear_IO_APIC();
		restore_boot_irq_mode();