Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77788878 authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Thomas Gleixner
Browse files

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: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent af93ebc0

arch/i386/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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_32.c→arch/x86/kernel/init_task.c

+6 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ static struct files_struct init_files = INIT_FILES; 
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

struct mm_struct init_mm = INIT_MM(init_mm);



EXPORT_SYMBOL(init_mm);



/*
@@ -35,12 +34,14 @@ union thread_union init_thread_union 
 * All other task structs will be allocated on slabs in fork.c

 */

struct task_struct init_task = INIT_TASK(init_task);



EXPORT_SYMBOL(init_task);



/*

 * per-CPU TSS segments. Threads are completely 'soft' on Linux,

 * no more per-task TSS's.

 * no more per-task TSS's. The TSS size is kept cacheline-aligned

 * so they are allowed to end up in the .data.cacheline_aligned

 * section. Since TSS's are completely CPU-local, we want them

 * on exact cacheline boundaries, to eliminate cacheline ping-pong.

 */

DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;

arch/x86/kernel/init_task_64.c

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
#include <linux/mm.h>

#include <linux/module.h>

#include <linux/sched.h>

#include <linux/init.h>

#include <linux/init_task.h>

#include <linux/fs.h>

#include <linux/mqueue.h>



#include <asm/uaccess.h>

#include <asm/pgtable.h>

#include <asm/desc.h>



static struct fs_struct init_fs = INIT_FS;

static struct files_struct init_files = INIT_FILES;

static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

struct mm_struct init_mm = INIT_MM(init_mm);



EXPORT_SYMBOL(init_mm);



/*

 * Initial task structure.

 *

 * We need to make sure that this is 8192-byte aligned due to the

 * way process stacks are handled. This is done by having a special

 * "init_task" linker map entry..

 */

union thread_union init_thread_union 

	__attribute__((__section__(".data.init_task"))) =

		{ INIT_THREAD_INFO(init_task) };



/*

 * Initial task structure.

 *

 * All other task structs will be allocated on slabs in fork.c

 */

struct task_struct init_task = INIT_TASK(init_task);



EXPORT_SYMBOL(init_task);

/*

 * per-CPU TSS segments. Threads are completely 'soft' on Linux,

 * no more per-task TSS's. The TSS size is kept cacheline-aligned

 * so they are allowed to end up in the .data.cacheline_aligned

 * section. Since TSS's are completely CPU-local, we want them

 * on exact cacheline boundaries, to eliminate cacheline ping-pong.

 */ 

DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;



/* 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);



#define ALIGN_TO_4K __attribute__((section(".data.init_task")))