diff options
| author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2007-10-19 20:35:02 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-19 20:35:02 +0200 |
| commit | 7778887880d278c23dc0975210df0381c878ae1e (patch) | |
| tree | 4c286d6a8d6467eaea9424b283b634934de02f87 /arch/i386/Makefile | |
| parent | af93ebc0b3ed8cdf93a6ed4bc1fab548f8059d0a (diff) | |
| download | linux-3.10-7778887880d278c23dc0975210df0381c878ae1e.tar.gz linux-3.10-7778887880d278c23dc0975210df0381c878ae1e.tar.bz2 linux-3.10-7778887880d278c23dc0975210df0381c878ae1e.zip | |
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/i386/Makefile')
| -rw-r--r-- | arch/i386/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index d82f11de60c..b88e47ca303 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -102,7 +102,7 @@ core-$(CONFIG_XEN) += arch/x86/xen/ # default subarch .h files mflags-y += -Iinclude/asm-x86/mach-default -head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o +head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task.o libs-y += arch/x86/lib/ core-y += arch/x86/kernel/ \ |