x86: apic - unify connect_bsp_APIC (36c9d674) · Commits · e / devices / android_kernel_xiaomi_sm6125

arch/x86/kernel/apic_32.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1387,6 +1387,7 @@ void smp_error_interrupt(struct pt_regs *regs)
		*/
		void __init connect_bsp_APIC(void)
		{
		#ifdef CONFIG_X86_32
		if (pic_mode) {
		/*
		* Do not trust the local APIC being empty at bootup.
		@@ -1401,6 +1402,7 @@ void __init connect_bsp_APIC(void)
		outb(0x70, 0x22);
		outb(0x01, 0x23);
		}
		#endif
		enable_apic_mode();
		}

+18 −2

Original line number	Diff line number	Diff line
		@@ -1285,10 +1285,26 @@ asmlinkage void smp_error_interrupt(void)
		}

		/**
		* * connect_bsp_APIC - attach the APIC to the interrupt system
		* */
		* connect_bsp_APIC - attach the APIC to the interrupt system
		*/
		void __init connect_bsp_APIC(void)
		{
		#ifdef CONFIG_X86_32
		if (pic_mode) {
		/*
		* Do not trust the local APIC being empty at bootup.
		*/
		clear_local_APIC();
		/*
		* PIC mode, enable APIC mode in the IMCR, i.e. connect BSP's
		* local APIC to INT and NMI lines.
		*/
		apic_printk(APIC_VERBOSE, "leaving PIC mode, "
		"enabling APIC mode.\n");
		outb(0x70, 0x22);
		outb(0x01, 0x23);
		}
		#endif
		enable_apic_mode();
		}