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

mn10300: 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/20120503085035.011270394@linutronix.de
parent 957b369c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config MN10300
	select HAVE_ARCH_TRACEHOOK
	select HAVE_ARCH_KGDB
	select HAVE_NMI_WATCHDOG if MN10300_WD_TIMER
	select HAVE_GENERIC_INIT_TASK

config AM33_2
	def_bool n
+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ UNIT := asb2364
endif


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

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

+1 −1
Original line number Diff line number Diff line
#
# Makefile for the MN10300-specific core kernel code
#
extra-y := head.o init_task.o vmlinux.lds
extra-y := head.o vmlinux.lds

fpu-obj-y := fpu-nofpu.o fpu-nofpu-low.o
fpu-obj-$(CONFIG_FPU) := fpu.o fpu-low.o

arch/mn10300/kernel/init_task.c

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line
/* MN10300 Initial task definitions
 *
 * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public Licence
 * as published by the Free Software Foundation; either version
 * 2 of the Licence, or (at your option) any later version.
 */
#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);