From eae22d2da59c0bb8491d8ef13dffd8baa7861250 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:54 +0200 Subject: [PATCH] --- yaml --- r: 65483 b: refs/heads/master c: abb11834c6515161babea211a7be1fc6dcb893dc h: refs/heads/master i: 65481: 23d831b1f9f9140434457cc3abb8b2f29e354d92 65479: cfb85f085e12ddf6ddfe19dc0f8d6f903275d2eb v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{time.c => time_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{time.c => time_64.c} (100%) diff --git a/[refs] b/[refs] index 70327e2ef201..45ace0df3ef4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96a6674c5ad6a6f596aab6ac826b93f5cd846749 +refs/heads/master: abb11834c6515161babea211a7be1fc6dcb893dc diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index b0a29b510427..1c9ae60f0bf5 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/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/trunk/arch/x86_64/kernel/time.c b/trunk/arch/x86_64/kernel/time_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/time.c rename to trunk/arch/x86_64/kernel/time_64.c