]> err.no Git - linux-2.6/commit
x86: merge init_task_32/64.c
authorHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Fri, 19 Oct 2007 18:35:02 +0000 (20:35 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 19 Oct 2007 18:35:02 +0000 (20:35 +0200)
commit7778887880d278c23dc0975210df0381c878ae1e
tree4c286d6a8d6467eaea9424b283b634934de02f87
parentaf93ebc0b3ed8cdf93a6ed4bc1fab548f8059d0a
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>
arch/i386/Makefile
arch/x86/kernel/Makefile_32
arch/x86/kernel/Makefile_64
arch/x86/kernel/init_task.c [moved from arch/x86/kernel/init_task_32.c with 79% similarity]
arch/x86/kernel/init_task_64.c [deleted file]
arch/x86/kernel/setup64.c
arch/x86_64/Makefile