From 26c87030c0e81114ed0aa79c81dcccc333e21b2c Mon Sep 17 00:00:00 2001 From: Hiroshi Shimamoto Date: Tue, 3 Jun 2008 13:06:07 -0700 Subject: [PATCH] --- yaml --- r: 99424 b: refs/heads/master c: d44b9d17faf7bca165ce73a1acb936b65a3f0cc6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 1 - trunk/arch/x86/kernel/cpu/Makefile | 1 + trunk/arch/x86/kernel/{ => cpu}/bugs_64.c | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86/kernel/{ => cpu}/bugs_64.c (100%) diff --git a/[refs] b/[refs] index 117b1692adcc..d5755149f1c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a5726528a70bb239bdd149aef7f2155cd2b1699 +refs/heads/master: d44b9d17faf7bca165ce73a1acb936b65a3f0cc6 diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index 5e618c3b4720..4934fec38c42 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -25,7 +25,6 @@ obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o obj-y += bootflag.o e820_$(BITS).o obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o obj-y += alternative.o i8253.o pci-nommu.o -obj-$(CONFIG_X86_64) += bugs_64.o obj-y += tsc_$(BITS).o io_delay.o rtc.o obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o diff --git a/trunk/arch/x86/kernel/cpu/Makefile b/trunk/arch/x86/kernel/cpu/Makefile index c77a1c50d944..65b1be5fe9ce 100644 --- a/trunk/arch/x86/kernel/cpu/Makefile +++ b/trunk/arch/x86/kernel/cpu/Makefile @@ -6,6 +6,7 @@ obj-y := intel_cacheinfo.o addon_cpuid_features.o obj-y += proc.o feature_names.o obj-$(CONFIG_X86_32) += common.o bugs.o +obj-$(CONFIG_X86_64) += bugs_64.o obj-$(CONFIG_X86_32) += amd.o obj-$(CONFIG_X86_64) += amd_64.o obj-$(CONFIG_X86_32) += cyrix.o diff --git a/trunk/arch/x86/kernel/bugs_64.c b/trunk/arch/x86/kernel/cpu/bugs_64.c similarity index 100% rename from trunk/arch/x86/kernel/bugs_64.c rename to trunk/arch/x86/kernel/cpu/bugs_64.c