---

yaml --- r: 65477 b: refs/heads/master c: 198a071 h: refs/heads/master i: 65475: 72b3f90 v: v3
git-mirror · Oct 11, 2007 · b6a5aa2 · b6a5aa2
1 parent ee39516
commit b6a5aa2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b69915deee81842ba192c251573141ac3af86db
+refs/heads/master: 198a071dff9ee61973edf8c58f22ecd5bc4892c8
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_MICROCODE)		+= microcode.o
 obj-$(CONFIG_X86_CPUID)		+= cpuid.o
 obj-$(CONFIG_SMP)		+= smp_64.o smpboot_64.o trampoline.o tsc_sync.o
 obj-y				+= apic_64.o  nmi_64.o
-obj-y				+= io_apic_64.o mpparse.o genapic.o genapic_flat.o
+obj-y				+= io_apic_64.o mpparse.o genapic_64.o genapic_flat.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel_64.o crash_64.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_PM)		+= suspend.o

diff --git a/trunk/arch/x86_64/kernel/genapic.c → trunk/arch/x86_64/kernel/genapic_64.c b/trunk/arch/x86_64/kernel/genapic.c → trunk/arch/x86_64/kernel/genapic_64.c