From 0df5f4807463bc6abd96226bdbc97c177dfd2ff7 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 23 Oct 2007 22:37:23 +0200 Subject: [PATCH] --- yaml --- r: 72367 b: refs/heads/master c: 01e11182e73eb36af1cc7f3b023d25aa62fd3a8d h: refs/heads/master i: 72365: e5adcad5a0afc4f84e92a3c9dd8c16965fe73e34 72363: 02e5d4f0d029a32552b8bfbf4d5731327cf6fa83 72359: f7eb8ee389b23c4aa2fe1c7a844a543e76bb4b51 72351: fcad60780d19d4b7999e51dd23d67c80b3b9d3d4 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile_64 | 17 +++-------------- trunk/arch/x86/kernel/cpu/mcheck/Makefile | 3 +++ trunk/arch/x86/kernel/{ => cpu/mcheck}/mce_64.c | 0 .../x86/kernel/{ => cpu/mcheck}/mce_amd_64.c | 0 .../x86/kernel/{ => cpu/mcheck}/mce_intel_64.c | 0 6 files changed, 7 insertions(+), 15 deletions(-) rename trunk/arch/x86/kernel/{ => cpu/mcheck}/mce_64.c (100%) rename trunk/arch/x86/kernel/{ => cpu/mcheck}/mce_amd_64.c (100%) rename trunk/arch/x86/kernel/{ => cpu/mcheck}/mce_intel_64.c (100%) diff --git a/[refs] b/[refs] index 01aacc43d315..a0dfd96a76ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bc258ad87e5b0bbbca247b24ce8fac380c7d86b +refs/heads/master: 01e11182e73eb36af1cc7f3b023d25aa62fd3a8d diff --git a/trunk/arch/x86/kernel/Makefile_64 b/trunk/arch/x86/kernel/Makefile_64 index 7b917d4cfbd9..466337ae9a1e 100644 --- a/trunk/arch/x86/kernel/Makefile_64 +++ b/trunk/arch/x86/kernel/Makefile_64 @@ -9,14 +9,11 @@ obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \ x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \ setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \ pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \ - perfctr-watchdog.o i8253.o + i8253.o obj-$(CONFIG_STACKTRACE) += stacktrace.o -obj-$(CONFIG_X86_MCE) += mce_64.o therm_throt.o -obj-$(CONFIG_X86_MCE_INTEL) += mce_intel_64.o -obj-$(CONFIG_X86_MCE_AMD) += mce_amd_64.o -obj-$(CONFIG_MTRR) += cpu/mtrr/ -obj-$(CONFIG_ACPI) += acpi/ +obj-y += cpu/ +obj-y += acpi/ obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_X86_CPUID) += cpuid.o @@ -27,7 +24,6 @@ obj-$(CONFIG_KEXEC) += machine_kexec_64.o relocate_kernel_64.o crash.o obj-$(CONFIG_CRASH_DUMP) += crash_dump_64.o obj-$(CONFIG_PM) += suspend_64.o obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o -obj-$(CONFIG_CPU_FREQ) += cpu/cpufreq/ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_IOMMU) += pci-gart_64.o aperture_64.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o @@ -42,13 +38,6 @@ obj-$(CONFIG_MODULES) += module_64.o obj-$(CONFIG_PCI) += early-quirks.o obj-y += topology.o -obj-y += intel_cacheinfo.o -obj-y += addon_cpuid_features.o obj-y += pcspeaker.o CFLAGS_vsyscall_64.o := $(PROFILING) -g0 - -therm_throt-y += cpu/mcheck/therm_throt.o -intel_cacheinfo-y += cpu/intel_cacheinfo.o -addon_cpuid_features-y += cpu/addon_cpuid_features.o -perfctr-watchdog-y += cpu/perfctr-watchdog.o diff --git a/trunk/arch/x86/kernel/cpu/mcheck/Makefile b/trunk/arch/x86/kernel/cpu/mcheck/Makefile index 403e720497ee..d7d2323bbb69 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/Makefile +++ b/trunk/arch/x86/kernel/cpu/mcheck/Makefile @@ -1,3 +1,6 @@ obj-y = mce_$(BITS).o therm_throt.o + obj-$(CONFIG_X86_32) += k7.o p4.o p5.o p6.o winchip.o +obj-$(CONFIG_X86_MCE_INTEL) += mce_intel_64.o +obj-$(CONFIG_X86_MCE_AMD) += mce_amd_64.o obj-$(CONFIG_X86_MCE_NONFATAL) += non-fatal.o diff --git a/trunk/arch/x86/kernel/mce_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c similarity index 100% rename from trunk/arch/x86/kernel/mce_64.c rename to trunk/arch/x86/kernel/cpu/mcheck/mce_64.c diff --git a/trunk/arch/x86/kernel/mce_amd_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c similarity index 100% rename from trunk/arch/x86/kernel/mce_amd_64.c rename to trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c diff --git a/trunk/arch/x86/kernel/mce_intel_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_intel_64.c similarity index 100% rename from trunk/arch/x86/kernel/mce_intel_64.c rename to trunk/arch/x86/kernel/cpu/mcheck/mce_intel_64.c