From: Thomas Gleixner Date: Thu, 11 Oct 2007 09:14:54 +0000 (+0200) Subject: x86_64: prepare shared kernel/time.c X-Git-Tag: v2.6.24-rc1~1572 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abb11834c6515161babea211a7be1fc6dcb893dc;p=linux-2.6 x86_64: prepare shared kernel/time.c Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index b0a29b5104..1c9ae60f0b 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -5,7 +5,7 @@ extra-y := head.o head64.o init_task.o vmlinux.lds EXTRA_AFLAGS := -traditional obj-y := process.o signal_64.o entry.o traps_64.o irq.o \ - ptrace.o time.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \ + ptrace.o time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \ x8664_ksyms.o i387_64.o syscall.o vsyscall_64.o \ setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \ pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o bugs_64.o \ diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time_64.c similarity index 100% rename from arch/x86_64/kernel/time.c rename to arch/x86_64/kernel/time_64.c