Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
x86: consolidate the cpu/ related code usage
The x86_64 arch/x86/kernel/Makefile uses references into
arch/x86/kernel/cpu/... to use code from there.
Unifiy it with the nicely structured i386 way and reuse the existing
subdirectory make rules.
Also move the machine check related source into ...kernel/cpu/mcheck,
where the other machine check related code is.
No code change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
+3
-14
arch/x86/kernel/Makefile_64
+3
-14
arch/x86/kernel/Makefile_64
···
9
9
x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \
10
10
setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
11
11
pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \
12
-
perfctr-watchdog.o i8253.o
12
+
i8253.o
13
13
14
14
obj-$(CONFIG_STACKTRACE) += stacktrace.o
15
-
obj-$(CONFIG_X86_MCE) += mce_64.o therm_throt.o
16
-
obj-$(CONFIG_X86_MCE_INTEL) += mce_intel_64.o
17
-
obj-$(CONFIG_X86_MCE_AMD) += mce_amd_64.o
18
-
obj-$(CONFIG_MTRR) += cpu/mtrr/
19
-
obj-$(CONFIG_ACPI) += acpi/
15
+
obj-y += cpu/
16
+
obj-y += acpi/
20
17
obj-$(CONFIG_X86_MSR) += msr.o
21
18
obj-$(CONFIG_MICROCODE) += microcode.o
22
19
obj-$(CONFIG_X86_CPUID) += cpuid.o
···
24
27
obj-$(CONFIG_CRASH_DUMP) += crash_dump_64.o
25
28
obj-$(CONFIG_PM) += suspend_64.o
26
29
obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o
27
-
obj-$(CONFIG_CPU_FREQ) += cpu/cpufreq/
28
30
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
29
31
obj-$(CONFIG_IOMMU) += pci-gart_64.o aperture_64.o
30
32
obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o
···
38
42
obj-$(CONFIG_PCI) += early-quirks.o
39
43
40
44
obj-y += topology.o
41
-
obj-y += intel_cacheinfo.o
42
-
obj-y += addon_cpuid_features.o
43
45
obj-y += pcspeaker.o
44
46
45
47
CFLAGS_vsyscall_64.o := $(PROFILING) -g0
46
-
47
-
therm_throt-y += cpu/mcheck/therm_throt.o
48
-
intel_cacheinfo-y += cpu/intel_cacheinfo.o
49
-
addon_cpuid_features-y += cpu/addon_cpuid_features.o
50
-
perfctr-watchdog-y += cpu/perfctr-watchdog.o
+3
arch/x86/kernel/cpu/mcheck/Makefile
+3
arch/x86/kernel/cpu/mcheck/Makefile
arch/x86/kernel/mce_64.c
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/mce_64.c
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/mce_amd_64.c
arch/x86/kernel/cpu/mcheck/mce_amd_64.c
arch/x86/kernel/mce_amd_64.c
arch/x86/kernel/cpu/mcheck/mce_amd_64.c
arch/x86/kernel/mce_intel_64.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
arch/x86/kernel/mce_intel_64.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c