Commit 7433c5cf authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

m32r: 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>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Link: http://lkml.kernel.org/r/20120503085034.756332161@linutronix.de
parent e336e05b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config M32R
	select GENERIC_IRQ_PROBE
	select GENERIC_IRQ_SHOW
	select GENERIC_ATOMIC64
	select HAVE_GENERIC_INIT_TASK

config SBUS
	bool
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ KBUILD_AFLAGS += $(aflags-y)

CHECKFLAGS	+= -D__m32r__ -D__BIG_ENDIAN__=1

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

LIBGCC	:= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)

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

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

obj-y	:= process.o entry.o traps.o align.o irq.o setup.o time.o \
	m32r_ksyms.o sys_m32r.o signal.o ptrace.o

arch/m32r/kernel/init_task.c

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line
/* orig : i386 init_task.c */

#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 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 __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);