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

Commit 7f11d8a5 authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] Remove all ifdefs for local/io apic 



IO-APIC or local APIC can only be disabled at runtime anyways and
Kconfig has forced these options on for a long time now.

The Kconfigs are kept only now for the benefit of the shared acpi
boot.c code.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 5ba5891d

arch/x86_64/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ obj-$(CONFIG_X86_MSR) += msr.o 
obj-$(CONFIG_MICROCODE)		+= microcode.o

obj-$(CONFIG_X86_CPUID)		+= cpuid.o

obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o

obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o  nmi.o

obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o \

obj-y				+= apic.o  nmi.o

obj-y				+= io_apic.o mpparse.o \

		genapic.o genapic_cluster.o genapic_flat.o

obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

arch/x86_64/kernel/apic.c

+1 −5
Original line number Diff line number Diff line
@@ -661,7 +661,6 @@ void __init init_apic_mappings(void) 
	 */

	boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));



#ifdef CONFIG_X86_IO_APIC

	{

		unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;

		int i;
@@ -679,7 +678,6 @@ void __init init_apic_mappings(void) 
			idx++;

		}

	}

#endif

}



/*
@@ -1129,12 +1127,10 @@ int __init APIC_init_uniprocessor (void) 


	setup_local_APIC();



#ifdef CONFIG_X86_IO_APIC

	if (smp_found_config && !skip_ioapic_setup && nr_ioapics)

		setup_IO_APIC();

	else

		nr_ioapics = 0;

#endif

	setup_boot_APIC_clock();

	check_nmi_watchdog();

	return 0;

arch/x86_64/kernel/crash.c

+0 −2
Original line number Diff line number Diff line
@@ -194,9 +194,7 @@ void machine_crash_shutdown(struct pt_regs *regs) 
	if(cpu_has_apic)

		 disable_local_APIC();



#if defined(CONFIG_X86_IO_APIC)

	disable_IO_APIC();

#endif



	crash_save_self(regs);

}

arch/x86_64/kernel/entry.S

+0 −2
Original line number Diff line number Diff line
@@ -676,7 +676,6 @@ ENTRY(call_function_interrupt) 
END(call_function_interrupt)

#endif



#ifdef CONFIG_X86_LOCAL_APIC	

ENTRY(apic_timer_interrupt)

	apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt

END(apic_timer_interrupt)
@@ -688,7 +687,6 @@ END(error_interrupt) 
ENTRY(spurious_interrupt)

	apicinterrupt SPURIOUS_APIC_VECTOR,smp_spurious_interrupt

END(spurious_interrupt)

#endif

				

/*

 * Exception entry points.

arch/x86_64/kernel/head64.c

+0 −2
Original line number Diff line number Diff line
@@ -111,10 +111,8 @@ void __init x86_64_start_kernel(char * real_mode_data) 
	if (s != NULL)

		numa_setup(s+5);

#endif

#ifdef CONFIG_X86_IO_APIC

	if (strstr(saved_command_line, "disableapic"))

		disable_apic = 1;

#endif

	/* You need early console to see that */

	if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE)

		panic("Kernel too big for kernel mapping\n");