Commit cb0fcba2 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

frv: 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.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Link: http://lkml.kernel.org/r/20120503085034.546687215@linutronix.de
parent c172ede4

arch/frv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config FRV 
	select GENERIC_IRQ_SHOW

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select GENERIC_CPU_DEVICES

	select HAVE_GENERIC_INIT_TASK



config ZONE_DMA

	bool

arch/frv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ ifdef CONFIG_DEBUG_INFO 
KBUILD_AFLAGS	+= -Wa,--gdwarf2

endif



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

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



core-y		+= arch/frv/kernel/ arch/frv/mm/

libs-y		+= arch/frv/lib/

arch/frv/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
heads-y				:= head-uc-fr401.o head-uc-fr451.o head-uc-fr555.o

heads-$(CONFIG_MMU)		:= head-mmu-fr451.o



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

extra-y:= head.o vmlinux.lds



obj-y := $(heads-y) entry.o entry-table.o break.o switch_to.o kernel_thread.o \

	 kernel_execve.o process.o traps.o ptrace.o signal.o dma.o \

arch/frv/kernel/init_task.c

deleted100644 → 0
+0 −32
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>





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 THREAD_SIZE 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 __init_task_data =

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