diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:14:33 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:14:33 -0400 |
commit | 21a44007745783d8997ed115852a42fb2613bf9a (patch) | |
tree | a729a48a52a32d9089a71cb385763dc0417f6bcf | |
parent | c30501e798fad2be81379bac98b6cfe731308f94 (diff) |
x86_64: prepare shared kernel/vsyscall.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86_64/kernel/Makefile | 4 | ||||
-rw-r--r-- | arch/x86_64/kernel/vsyscall_64.c (renamed from arch/x86_64/kernel/vsyscall.c) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 14316a259aea..a5ff38d5097c 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile | |||
@@ -6,7 +6,7 @@ extra-y := head.o head64.o init_task.o vmlinux.lds | |||
6 | EXTRA_AFLAGS := -traditional | 6 | EXTRA_AFLAGS := -traditional |
7 | obj-y := process.o signal.o entry.o traps_64.o irq.o \ | 7 | obj-y := process.o signal.o entry.o traps_64.o irq.o \ |
8 | ptrace.o time.o ioport.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \ | 8 | ptrace.o time.o ioport.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \ |
9 | x8664_ksyms.o i387.o syscall.o vsyscall.o \ | 9 | x8664_ksyms.o i387.o syscall.o vsyscall_64.o \ |
10 | setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \ | 10 | setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \ |
11 | pci-dma_64.o pci-nommu.o alternative.o hpet_64.o tsc.o bugs.o \ | 11 | pci-dma_64.o pci-nommu.o alternative.o hpet_64.o tsc.o bugs.o \ |
12 | perfctr-watchdog.o | 12 | perfctr-watchdog.o |
@@ -46,7 +46,7 @@ obj-y += intel_cacheinfo.o | |||
46 | obj-y += addon_cpuid_features.o | 46 | obj-y += addon_cpuid_features.o |
47 | obj-y += pcspeaker.o | 47 | obj-y += pcspeaker.o |
48 | 48 | ||
49 | CFLAGS_vsyscall.o := $(PROFILING) -g0 | 49 | CFLAGS_vsyscall_64.o := $(PROFILING) -g0 |
50 | 50 | ||
51 | therm_throt-y += ../../i386/kernel/cpu/mcheck/therm_throt.o | 51 | therm_throt-y += ../../i386/kernel/cpu/mcheck/therm_throt.o |
52 | bootflag-y += ../../i386/kernel/bootflag.o | 52 | bootflag-y += ../../i386/kernel/bootflag.o |
diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall_64.c index 06c34949bfdc..06c34949bfdc 100644 --- a/arch/x86_64/kernel/vsyscall.c +++ b/arch/x86_64/kernel/vsyscall_64.c | |||