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_32 | |
| 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_32')
| -rw-r--r-- | arch/x86/kernel/Makefile_32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32 index a3fa11f8f46..69990f0ba86 100644 --- a/arch/x86/kernel/Makefile_32 +++ b/arch/x86/kernel/Makefile_32 | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | extra-y := head_32.o init_task_32.o vmlinux.lds | 5 | extra-y := head_32.o init_task.o vmlinux.lds |
| 6 | 6 | ||
| 7 | obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ | 7 | obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ |
| 8 | ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \ | 8 | ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \ |