Skip to contentSkip to conversation

x86: merge init_task_32/64.c

PATCH In review Hiroshi Shimamoto 2 participants 2 messages Oct 17, 2007 – Oct 18, 2007 x86

lore
Share & tools
lore

Hiroshi Shimamoto

author
#0 lore raw

PATCH 1/1 x86: merge init_task_32/64.c

Merge init_task_32/64.c.
Move 64bit per cpu data orig_ist to setup64.c.

Signed-off-by Hiroshi Shimamoto <[email protected]>
---
 arch/i386/Makefile             |    2 +-
 arch/x86/kernel/Makefile_32    |    2 +-
 arch/x86/kernel/Makefile_64    |    2 +-
 arch/x86/kernel/init_task.c    |   49 ++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/init_task_32.c |   46 ----------------------------------
 arch/x86/kernel/init_task_64.c |   54 ----------------------------------------
 arch/x86/kernel/setup64.c      |    6 ++++
 arch/x86_64/Makefile           |    2 +-
 8 files changed, 59 insertions(+), 104 deletions(-)
 create mode 100644 arch/x86/kernel/init_task.c
 delete mode 100644 arch/x86/kernel/init_task_32.c
 delete mode 100644 arch/x86/kernel/init_task_64.c
arch/i386/Makefile +1 -1
index f036d2d..6966116 100644
@@ -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/ \
arch/x86/kernel/Makefile_32 +1 -1
index a3fa11f..69990f0 100644
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-extra-y := head_32.o init_task_32.o vmlinux.lds
+extra-y := head_32.o init_task.o vmlinux.lds
 
 obj-y	:= process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
 		ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \
arch/x86/kernel/Makefile_64 +1 -1
index 43da662..2fc3d3f 100644
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-extra-y 	:= head_64.o head64.o init_task_64.o vmlinux.lds
+extra-y 	:= head_64.o head64.o init_task.o vmlinux.lds
 EXTRA_AFLAGS	:= -traditional
 obj-y	:= process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
 		ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \
arch/x86/kernel/init_task.c new file +49 -0

49 lines not on this page · raw message

arch/x86/kernel/init_task_32.c deleted +0 -46

46 lines not on this page · raw message

arch/x86/kernel/init_task_64.c deleted +0 -54

54 lines not on this page · raw message

arch/x86/kernel/setup64.c +6 -0
index ba91882..e11886e 100644
@@ -185,6 +185,12 @@ void __cpuinit check_efer(void)
 unsigned long kernel_eflags;
 
 /*
+ * Copies of the original ist values from the tss are only accessed during
+ * debugging, no special alignment required.
+ */
+DEFINE_PER_CPU(struct orig_ist, orig_ist);
+
+/*
  * cpu_init() initializes state that is per-CPU. Some data is already
  * initialized (naturally) in the bootstrap process, such as the GDT
  * and IDT. We reload them nevertheless, this function acts as a
arch/x86_64/Makefile +1 -1
index 03e1ede..ca71c43 100644
@@ -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/ \
Signature · 1 line
1.5.2.3