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)             += ../../x86/kernel/cpu/mtrr/
-obj-$(CONFIG_ACPI)             += ../../x86/kernel/acpi/
+obj-$(CONFIG_MTRR)             += cpu/mtrr/
+obj-$(CONFIG_ACPI)             += acpi/
 obj-$(CONFIG_X86_MSR)          += msr.o
 obj-$(CONFIG_MICROCODE)                += microcode.o
 obj-$(CONFIG_X86_CPUID)                += cpuid.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)         += ../../x86/kernel/cpu/cpufreq/
+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
 
 CFLAGS_vsyscall_64.o           := $(PROFILING) -g0
 
-therm_throt-y                   += ../../x86/kernel/cpu/mcheck/therm_throt.o
-intel_cacheinfo-y              += ../../x86/kernel/cpu/intel_cacheinfo.o
-addon_cpuid_features-y         += ../../x86/kernel/cpu/addon_cpuid_features.o
-perfctr-watchdog-y             += ../../x86/kernel/cpu/perfctr-watchdog.o
+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