x86/apic: Split out restore_boot_irq_mode() from disable_IO_APIC() (ce279cdc) · Commits · 戴 / test

This is a preparation patch. Split out the code which restores boot irq mode from disable_IO_APIC() into the new restore_boot_irq_mode() function. No functional changes. Signed-off-by:

Baoquan He <bhe@redhat.com> Reviewed-by:

Eric W. Biederman <ebiederm@xmission.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: douly.fnst@cn.fujitsu.com Cc: joro@8bytes.org Cc: prarit@redhat.com Cc: uobergfe@redhat.com Link: http://lkml.kernel.org/r/20180214054656.3780-2-bhe@redhat.com [ Build fix for !CONFIG_IO_APIC and rewrote the changelog. ] Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/x86/include/asm/io_apic.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,7 @@ 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 restore_boot_irq_mode(void);
		extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin);
		extern void print_IO_APICs(void);
		#else /* !CONFIG_X86_IO_APIC */
		@@ -232,6 +233,7 @@ static inline void io_apic_init_mappings(void) { }

		static inline void setup_IO_APIC(void) { }
		static inline void enable_IO_APIC(void) { }
		static inline void restore_boot_irq_mode(void) { }

		#endif

arch/x86/kernel/apic/io_apic.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1448,6 +1448,11 @@ void disable_IO_APIC(void)
		*/
		clear_IO_APIC();

		restore_boot_irq_mode();
		}

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

Admin message