---

yaml --- r: 136887 b: refs/heads/master c: f62bae5 h: refs/heads/master i: 136885: 9cdd020 136883: 6a3ae05 136879: 5efd577 v: v3
git-mirror · Feb 17, 2009 · e9f1c7a · e9f1c7a
1 parent 22739af
commit e9f1c7a
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be163a159b223e94b3180afdd47a8d468eb9a492
+refs/heads/master: f62bae5009c1ba596cd475cafbc83e0570a36e26
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
@@ -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,17 +115,13 @@ 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_PM_TIMER)	+= pmtimer_64.o
-        obj-$(CONFIG_AUDIT)		+= audit_64.o
-
-        obj-$(CONFIG_GART_IOMMU)	+= pci-gart_64.o aperture_64.o
-        obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o
-        obj-$(CONFIG_AMD_IOMMU)		+= amd_iommu_init.o amd_iommu.o
-
-        obj-$(CONFIG_PCI_MMCONFIG)	+= mmconf-fam10h_64.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
+
+	obj-$(CONFIG_GART_IOMMU)	+= pci-gart_64.o aperture_64.o
+	obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o
+	obj-$(CONFIG_AMD_IOMMU)		+= amd_iommu_init.o amd_iommu.o
+
+	obj-$(CONFIG_PCI_MMCONFIG)	+= mmconf-fam10h_64.o
 endif
diff --git a/trunk/arch/x86/kernel/apic/Makefile b/trunk/arch/x86/kernel/apic/Makefile
@@ -0,0 +1,15 @@
+#
+# 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
+
diff --git a/trunk/arch/x86/kernel/apic.c → trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic.c → trunk/arch/x86/kernel/apic/apic.c
diff --git a/trunk/arch/x86/kernel/genapic_64.c → trunk/arch/x86/kernel/apic/apic_64.c b/trunk/arch/x86/kernel/genapic_64.c → trunk/arch/x86/kernel/apic/apic_64.c
diff --git a/trunk/arch/x86/kernel/genapic_flat_64.c → trunk/arch/x86/kernel/apic/apic_flat_64.c b/trunk/arch/x86/kernel/genapic_flat_64.c → trunk/arch/x86/kernel/apic/apic_flat_64.c
diff --git a/trunk/arch/x86/kernel/io_apic.c → trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/io_apic.c → trunk/arch/x86/kernel/apic/io_apic.c
diff --git a/trunk/arch/x86/kernel/ipi.c → trunk/arch/x86/kernel/apic/ipi.c b/trunk/arch/x86/kernel/ipi.c → trunk/arch/x86/kernel/apic/ipi.c
diff --git a/trunk/arch/x86/kernel/nmi.c → trunk/arch/x86/kernel/apic/nmi.c b/trunk/arch/x86/kernel/nmi.c → trunk/arch/x86/kernel/apic/nmi.c
diff --git a/trunk/arch/x86/kernel/genx2apic_cluster.c → trunk/arch/x86/kernel/apic/x2apic_cluster.c b/trunk/arch/x86/kernel/genx2apic_cluster.c → trunk/arch/x86/kernel/apic/x2apic_cluster.c
diff --git a/trunk/arch/x86/kernel/genx2apic_phys.c → trunk/arch/x86/kernel/apic/x2apic_phys.c b/trunk/arch/x86/kernel/genx2apic_phys.c → trunk/arch/x86/kernel/apic/x2apic_phys.c
diff --git a/trunk/arch/x86/kernel/genx2apic_uv_x.c → trunk/arch/x86/kernel/apic/x2apic_uv_x.c b/trunk/arch/x86/kernel/genx2apic_uv_x.c → trunk/arch/x86/kernel/apic/x2apic_uv_x.c