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

Commit 2a05180f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



Move the 32-bit extended-arch APIC drivers to arch/x86/kernel/apic/
too, and rename apic_64.c to probe_64.c.

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

arch/x86/kernel/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o 
obj-y			+= time_$(BITS).o ioport.o ldt.o dumpstack.o

obj-y			+= setup.o i8259.o irqinit_$(BITS).o

obj-$(CONFIG_X86_VISWS)	+= visws_quirks.o

obj-$(CONFIG_X86_32)	+= probe_32.o probe_roms_32.o

obj-$(CONFIG_X86_32)	+= probe_roms_32.o

obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o

obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o

obj-$(CONFIG_X86_64)	+= syscall_64.o vsyscall_64.o
@@ -70,10 +70,6 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o 
obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o

obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-$(CONFIG_X86_BIGSMP)	+= bigsmp_32.o

obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o

obj-$(CONFIG_X86_ES7000)	+= es7000_32.o

obj-$(CONFIG_X86_SUMMIT)	+= summit_32.o

obj-y				+= vsmp_64.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_MODULES)		+= module_$(BITS).o

arch/x86/kernel/apic/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -2,14 +2,19 @@ 
# Makefile for local APIC drivers and for the IO-APIC code

#



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

obj-y				:= apic.o probe_$(BITS).o ipi.o nmi.o

obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o

obj-$(CONFIG_SMP)		+= ipi.o

obj-$



ifeq ($(CONFIG_X86_64),y)

obj-y				+= apic_64.o apic_flat_64.o

obj-y				+= 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



obj-$(CONFIG_X86_BIGSMP)	+= bigsmp_32.o

obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o

obj-$(CONFIG_X86_ES7000)	+= es7000_32.o

obj-$(CONFIG_X86_SUMMIT)	+= summit_32.o