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

Commit f62bae50 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: move APIC drivers to arch/x86/kernel/apic/* 



arch/x86/kernel/ is getting a bit crowded, and the APIC
drivers are scattered into various different files.

Move them to arch/x86/kernel/apic/*, and also remove
the 'gen' prefix from those which had it.

Also move APIC related functionality: the IO-APIC driver,
the NMI and the IPI code.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent be163a15

arch/x86/kernel/Makefile

+11 −16
Original line number Diff line number Diff line
@@ -58,13 +58,12 @@ obj-$(CONFIG_PCI) += early-quirks.o 
apm-y				:= apm_32.o

obj-$(CONFIG_APM)		+= apm.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_SMP)		+= smpboot.o tsc_sync.o ipi.o

obj-$(CONFIG_SMP)		+= smpboot.o tsc_sync.o

obj-$(CONFIG_SMP)		+= setup_percpu.o

obj-$(CONFIG_X86_64_SMP)	+= tsc_sync.o

obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline_$(BITS).o

obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o

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

obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o

obj-$(CONFIG_X86_LOCAL_APIC)	+= apic/

obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups_32.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o
@@ -116,11 +115,7 @@ obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o # NB rename without _64 
###

# 64 bit specific files

ifeq ($(CONFIG_X86_64),y)

        obj-y				+= genapic_64.o genapic_flat_64.o

        obj-$(CONFIG_X86_X2APIC)	+= genx2apic_cluster.o

        obj-$(CONFIG_X86_X2APIC)	+= genx2apic_phys.o

	obj-$(CONFIG_X86_UV)		+= genx2apic_uv_x.o tlb_uv.o

	obj-$(CONFIG_X86_UV)		+= bios_uv.o uv_irq.o uv_sysfs.o

	obj-$(CONFIG_X86_UV)		+= tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o

	obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer_64.o

	obj-$(CONFIG_AUDIT)		+= audit_64.o

arch/x86/kernel/apic/Makefile

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#

# Makefile for local APIC drivers and for the IO-APIC code

#



obj-y				:= apic.o ipi.o nmi.o

obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o

obj-$(CONFIG_SMP)		+= ipi.o



ifeq ($(CONFIG_X86_64),y)

obj-y				+= apic_64.o apic_flat_64.o

obj-$(CONFIG_X86_X2APIC)	+= x2apic_cluster.o

obj-$(CONFIG_X86_X2APIC)	+= x2apic_phys.o

obj-$(CONFIG_X86_UV)		+= x2apic_uv_x.o

endif

arch/x86/kernel/apic.c→arch/x86/kernel/apic/apic.c

+0 −0

File moved.

View file