From e9f1c7a44fac738279d03734f0a9374905f1f30a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 17 Feb 2009 18:09:24 +0100 Subject: [PATCH] --- yaml --- r: 136887 b: refs/heads/master c: f62bae5009c1ba596cd475cafbc83e0570a36e26 h: refs/heads/master i: 136885: 9cdd020e192a230aa79436ed00794dc71aef6194 136883: 6a3ae05857d7989d263105e07a06524264c11cb0 136879: 5efd5779d982a62b703fb89d16f10731522bb7a3 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 27 ++++++++----------- trunk/arch/x86/kernel/apic/Makefile | 15 +++++++++++ trunk/arch/x86/kernel/{ => apic}/apic.c | 0 .../kernel/{genapic_64.c => apic/apic_64.c} | 0 .../apic_flat_64.c} | 0 trunk/arch/x86/kernel/{ => apic}/io_apic.c | 0 trunk/arch/x86/kernel/{ => apic}/ipi.c | 0 trunk/arch/x86/kernel/{ => apic}/nmi.c | 0 .../x2apic_cluster.c} | 0 .../{genx2apic_phys.c => apic/x2apic_phys.c} | 0 .../{genx2apic_uv_x.c => apic/x2apic_uv_x.c} | 0 12 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 trunk/arch/x86/kernel/apic/Makefile rename trunk/arch/x86/kernel/{ => apic}/apic.c (100%) rename trunk/arch/x86/kernel/{genapic_64.c => apic/apic_64.c} (100%) rename trunk/arch/x86/kernel/{genapic_flat_64.c => apic/apic_flat_64.c} (100%) rename trunk/arch/x86/kernel/{ => apic}/io_apic.c (100%) rename trunk/arch/x86/kernel/{ => apic}/ipi.c (100%) rename trunk/arch/x86/kernel/{ => apic}/nmi.c (100%) rename trunk/arch/x86/kernel/{genx2apic_cluster.c => apic/x2apic_cluster.c} (100%) rename trunk/arch/x86/kernel/{genx2apic_phys.c => apic/x2apic_phys.c} (100%) rename trunk/arch/x86/kernel/{genx2apic_uv_x.c => apic/x2apic_uv_x.c} (100%) diff --git a/[refs] b/[refs] index dcbafe2a9016..a02ded229dc3 100644 --- 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 index 1cefd218f764..9139ff69471c 100644 --- 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 new file mode 100644 index 000000000000..da20b70c4000 --- /dev/null +++ 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 b/trunk/arch/x86/kernel/apic/apic.c similarity index 100% rename from trunk/arch/x86/kernel/apic.c rename to trunk/arch/x86/kernel/apic/apic.c diff --git a/trunk/arch/x86/kernel/genapic_64.c b/trunk/arch/x86/kernel/apic/apic_64.c similarity index 100% rename from trunk/arch/x86/kernel/genapic_64.c rename to trunk/arch/x86/kernel/apic/apic_64.c diff --git a/trunk/arch/x86/kernel/genapic_flat_64.c b/trunk/arch/x86/kernel/apic/apic_flat_64.c similarity index 100% rename from trunk/arch/x86/kernel/genapic_flat_64.c rename to trunk/arch/x86/kernel/apic/apic_flat_64.c diff --git a/trunk/arch/x86/kernel/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c similarity index 100% rename from trunk/arch/x86/kernel/io_apic.c rename to trunk/arch/x86/kernel/apic/io_apic.c diff --git a/trunk/arch/x86/kernel/ipi.c b/trunk/arch/x86/kernel/apic/ipi.c similarity index 100% rename from trunk/arch/x86/kernel/ipi.c rename to trunk/arch/x86/kernel/apic/ipi.c diff --git a/trunk/arch/x86/kernel/nmi.c b/trunk/arch/x86/kernel/apic/nmi.c similarity index 100% rename from trunk/arch/x86/kernel/nmi.c rename to trunk/arch/x86/kernel/apic/nmi.c diff --git a/trunk/arch/x86/kernel/genx2apic_cluster.c b/trunk/arch/x86/kernel/apic/x2apic_cluster.c similarity index 100% rename from trunk/arch/x86/kernel/genx2apic_cluster.c rename to trunk/arch/x86/kernel/apic/x2apic_cluster.c diff --git a/trunk/arch/x86/kernel/genx2apic_phys.c b/trunk/arch/x86/kernel/apic/x2apic_phys.c similarity index 100% rename from trunk/arch/x86/kernel/genx2apic_phys.c rename to trunk/arch/x86/kernel/apic/x2apic_phys.c diff --git a/trunk/arch/x86/kernel/genx2apic_uv_x.c b/trunk/arch/x86/kernel/apic/x2apic_uv_x.c similarity index 100% rename from trunk/arch/x86/kernel/genx2apic_uv_x.c rename to trunk/arch/x86/kernel/apic/x2apic_uv_x.c