diff options
| author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2007-10-19 14:35:02 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-19 14:35:02 -0400 |
| commit | 7778887880d278c23dc0975210df0381c878ae1e (patch) | |
| tree | 4c286d6a8d6467eaea9424b283b634934de02f87 /arch/x86/kernel/Makefile_64 | |
| parent | af93ebc0b3ed8cdf93a6ed4bc1fab548f8059d0a (diff) | |
x86: merge init_task_32/64.c
Merge init_task_32/64.c.
Move 64bit per cpu data orig_ist to setup64.c.
[ mingo: fixed checkpatch trivialities. ]
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/Makefile_64')
| -rw-r--r-- | arch/x86/kernel/Makefile_64 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 index 43da66213a47..2fc3d3f2c27e 100644 --- a/arch/x86/kernel/Makefile_64 +++ b/arch/x86/kernel/Makefile_64 | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | extra-y := head_64.o head64.o init_task_64.o vmlinux.lds | 5 | extra-y := head_64.o head64.o init_task.o vmlinux.lds |
| 6 | EXTRA_AFLAGS := -traditional | 6 | EXTRA_AFLAGS := -traditional |
| 7 | obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \ | 7 | obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \ |
| 8 | ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \ | 8 | ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \ |