diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-03 05:02:58 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-05 07:00:25 -0400 |
commit | 842d7b1ccaefb6668cad193dcc894959ad756f3f (patch) | |
tree | b1cf487343287b04f9a6d53112cf5a4b185e8774 /arch/score | |
parent | edd813bb35227f19e9d7f808165c0c4e95e03149 (diff) |
score: Use generic init_task
Same code. Use the generic version.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Link: http://lkml.kernel.org/r/20120503085035.332320547@linutronix.de
Diffstat (limited to 'arch/score')
-rw-r--r-- | arch/score/Kconfig | 1 | ||||
-rw-r--r-- | arch/score/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/score/kernel/init_task.c | 46 |
3 files changed, 2 insertions, 47 deletions
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 4b285779ac05..c760bccfad40 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig | |||
@@ -9,6 +9,7 @@ config SCORE | |||
9 | select HAVE_MEMBLOCK_NODE_MAP | 9 | select HAVE_MEMBLOCK_NODE_MAP |
10 | select ARCH_DISCARD_MEMBLOCK | 10 | select ARCH_DISCARD_MEMBLOCK |
11 | select GENERIC_CPU_DEVICES | 11 | select GENERIC_CPU_DEVICES |
12 | select HAVE_GENERIC_INIT_TASK | ||
12 | 13 | ||
13 | choice | 14 | choice |
14 | prompt "System type" | 15 | prompt "System type" |
diff --git a/arch/score/kernel/Makefile b/arch/score/kernel/Makefile index f218673b5d3d..fb1802b3f542 100644 --- a/arch/score/kernel/Makefile +++ b/arch/score/kernel/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | extra-y := head.o vmlinux.lds | 5 | extra-y := head.o vmlinux.lds |
6 | 6 | ||
7 | obj-y += entry.o init_task.o irq.o process.o ptrace.o \ | 7 | obj-y += entry.o irq.o process.o ptrace.o \ |
8 | setup.o signal.o sys_score.o time.o traps.o \ | 8 | setup.o signal.o sys_score.o time.o traps.o \ |
9 | sys_call_table.o | 9 | sys_call_table.o |
10 | 10 | ||
diff --git a/arch/score/kernel/init_task.c b/arch/score/kernel/init_task.c deleted file mode 100644 index baa03ee217d1..000000000000 --- a/arch/score/kernel/init_task.c +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | /* | ||
2 | * arch/score/kernel/init_task.c | ||
3 | * | ||
4 | * Score Processor version. | ||
5 | * | ||
6 | * Copyright (C) 2009 Sunplus Core Technology Co., Ltd. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, see the file COPYING, or write | ||
20 | * to the Free Software Foundation, Inc., | ||
21 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
22 | */ | ||
23 | |||
24 | #include <linux/init_task.h> | ||
25 | #include <linux/mqueue.h> | ||
26 | |||
27 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | ||
28 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | ||
29 | |||
30 | /* | ||
31 | * Initial thread structure. | ||
32 | * | ||
33 | * We need to make sure that this is THREAD_SIZE aligned due to the | ||
34 | * way process stacks are handled. This is done by having a special | ||
35 | * "init_task" linker map entry.. | ||
36 | */ | ||
37 | union thread_union init_thread_union __init_task_data = | ||
38 | { INIT_THREAD_INFO(init_task) }; | ||
39 | |||
40 | /* | ||
41 | * Initial task structure. | ||
42 | * | ||
43 | * All other task structs will be allocated on slabs in fork.c | ||
44 | */ | ||
45 | struct task_struct init_task = INIT_TASK(init_task); | ||
46 | EXPORT_SYMBOL(init_task); | ||