i386: move kernel/cpu/cpufreq

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 97b64d7..fc86d41 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1067,7 +1067,7 @@ config APM_REAL_MODE_POWER_OFF
 
 endif # APM
 
-source "arch/i386/kernel/cpu/cpufreq/Kconfig"
+source "arch/x86/kernel/cpu/cpufreq/Kconfig"
 
 endmenu
 

diff --git a/arch/i386/kernel/cpu/Makefile b/arch/i386/kernel/cpu/Makefile
index 09effc0..8d9ce02 100644 (file)
--- a/arch/i386/kernel/cpu/Makefile
+++ b/arch/i386/kernel/cpu/Makefile
@@ -15,6 +15,6 @@ obj-y +=      umc.o
 obj-$(CONFIG_X86_MCE)  +=      ../../../x86/kernel/cpu/mcheck/
 
 obj-$(CONFIG_MTRR)     +=      mtrr/
-obj-$(CONFIG_CPU_FREQ) +=      cpufreq/
+obj-$(CONFIG_CPU_FREQ) +=      ../../../x86/kernel/cpu/cpufreq/
 
 obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o

diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/x86/kernel/cpu/cpufreq/Kconfig
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/Kconfig
rename to arch/x86/kernel/cpu/cpufreq/Kconfig

diff --git a/arch/i386/kernel/cpu/cpufreq/Makefile b/arch/x86/kernel/cpu/cpufreq/Makefile
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/Makefile
rename to arch/x86/kernel/cpu/cpufreq/Makefile

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
rename to arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

diff --git a/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c
rename to arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c

diff --git a/arch/i386/kernel/cpu/cpufreq/e_powersaver.c b/arch/x86/kernel/cpu/cpufreq/e_powersaver.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/e_powersaver.c
rename to arch/x86/kernel/cpu/cpufreq/e_powersaver.c

diff --git a/arch/i386/kernel/cpu/cpufreq/elanfreq.c b/arch/x86/kernel/cpu/cpufreq/elanfreq.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/elanfreq.c
rename to arch/x86/kernel/cpu/cpufreq/elanfreq.c

diff --git a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
rename to arch/x86/kernel/cpu/cpufreq/gx-suspmod.c

diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/x86/kernel/cpu/cpufreq/longhaul.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/longhaul.c
rename to arch/x86/kernel/cpu/cpufreq/longhaul.c

diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.h b/arch/x86/kernel/cpu/cpufreq/longhaul.h
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/longhaul.h
rename to arch/x86/kernel/cpu/cpufreq/longhaul.h

diff --git a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/x86/kernel/cpu/cpufreq/longrun.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/longrun.c
rename to arch/x86/kernel/cpu/cpufreq/longrun.c

diff --git a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
rename to arch/x86/kernel/cpu/cpufreq/p4-clockmod.c

diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/powernow-k6.c
rename to arch/x86/kernel/cpu/cpufreq/powernow-k6.c

diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/powernow-k7.c
rename to arch/x86/kernel/cpu/cpufreq/powernow-k7.c

diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.h b/arch/x86/kernel/cpu/cpufreq/powernow-k7.h
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/powernow-k7.h
rename to arch/x86/kernel/cpu/cpufreq/powernow-k7.h

diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/powernow-k8.c
rename to arch/x86/kernel/cpu/cpufreq/powernow-k8.c

diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/powernow-k8.h
rename to arch/x86/kernel/cpu/cpufreq/powernow-k8.h

diff --git a/arch/i386/kernel/cpu/cpufreq/sc520_freq.c b/arch/x86/kernel/cpu/cpufreq/sc520_freq.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/sc520_freq.c
rename to arch/x86/kernel/cpu/cpufreq/sc520_freq.c

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
rename to arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
rename to arch/x86/kernel/cpu/cpufreq/speedstep-ich.c

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
rename to arch/x86/kernel/cpu/cpufreq/speedstep-lib.c

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.h
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
rename to arch/x86/kernel/cpu/cpufreq/speedstep-lib.h

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
similarity index 100%
rename from arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
rename to arch/x86/kernel/cpu/cpufreq/speedstep-smi.c

diff --git a/arch/x86_64/kernel/Makefile_64 b/arch/x86_64/kernel/Makefile_64
index 1c9de79..a6d8216 100644 (file)
--- a/arch/x86_64/kernel/Makefile_64
+++ b/arch/x86_64/kernel/Makefile_64
@@ -27,7 +27,7 @@ obj-$(CONFIG_KEXEC)           += machine_kexec_64.o relocate_kernel_64.o crash_64.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)         += ../../i386/kernel/cpu/cpufreq/
+obj-$(CONFIG_CPU_FREQ)         += ../../x86/kernel/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