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

Commit 957b369c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

mips: Use generic init_task 



Same code. Use the generic version. The special Makefile treatment is
pointless anyway as init_task.o contains only data which is handled by
the linker script. So no point on being treated like head text.

Make the linker script align the task on THREAD_SIZE and not on
PAGE_SIZE, as PAGE_SIZE might be smaller than THREAD_SIZE.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Link: http://lkml.kernel.org/r/20120503085034.941344764@linutronix.de
parent 16caadb8

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config MIPS 
	select HAVE_MEMBLOCK_NODE_MAP

	select ARCH_DISCARD_MEMBLOCK

	select GENERIC_SMP_IDLE_THREAD

	select HAVE_GENERIC_INIT_TASK



menu "Machine selection"

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ endif 


OBJCOPYFLAGS		+= --remove-section=.reginfo



head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o

head-y := arch/mips/kernel/head.o



libs-y			+= arch/mips/lib/

arch/mips/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the Linux/MIPS kernel.

#



extra-y		:= head.o init_task.o vmlinux.lds

extra-y		:= head.o vmlinux.lds



obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \

		   ptrace.o reset.o setup.o signal.o syscall.o \

arch/mips/kernel/init_task.c

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

#include <linux/export.h>

#include <linux/sched.h>

#include <linux/init_task.h>

#include <linux/fs.h>

#include <linux/mqueue.h>



#include <asm/thread_info.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>



static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

/*

 * Initial thread structure.

 *

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

 * way process stacks are handled. This is done by making sure

 * the linker maps this in the .text segment right after head.S,

 * and making head.S ensure the proper alignment.

 *

 * The things we do for performance..

 */

union thread_union init_thread_union __init_task_data

	__attribute__((__aligned__(THREAD_SIZE))) =

		{ 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);

arch/mips/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ SECTIONS 
	.data : {	/* Data */

		. = . + DATAOFFSET;		/* for CONFIG_MAPPED_KERNEL */



		INIT_TASK_DATA(PAGE_SIZE)

		INIT_TASK_DATA(THREAD_SIZE)

		NOSAVE_DATA

		CACHELINE_ALIGNED_DATA(1 << CONFIG_MIPS_L1_CACHE_SHIFT)

		READ_MOSTLY_DATA(1 << CONFIG_MIPS_L1_CACHE_SHIFT)