diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2007-10-19 18:35:02 (GMT) |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-19 18:35:02 (GMT) |
commit | 7778887880d278c23dc0975210df0381c878ae1e (patch) | |
tree | 4c286d6a8d6467eaea9424b283b634934de02f87 /arch/x86_64/Makefile | |
parent | af93ebc0b3ed8cdf93a6ed4bc1fab548f8059d0a (diff) | |
download | linux-fsl-qoriq-7778887880d278c23dc0975210df0381c878ae1e.tar.xz |
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_64/Makefile')
-rw-r--r-- | arch/x86_64/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index f48d862..6d89ab7 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile @@ -74,7 +74,7 @@ KBUILD_CFLAGS += $(cflags-y) CFLAGS_KERNEL += $(cflags-kernel-y) KBUILD_AFLAGS += -m64 -head-y := arch/x86/kernel/head_64.o arch/x86/kernel/head64.o arch/x86/kernel/init_task_64.o +head-y := arch/x86/kernel/head_64.o arch/x86/kernel/head64.o arch/x86/kernel/init_task.o libs-y += arch/x86/lib/ core-y += arch/x86/kernel/ \ |