diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-03 05:02:52 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-05 07:00:22 -0400 |
commit | c172ede404d4eda55ed2c0df1c4c11df9311b299 (patch) | |
tree | 52c46c642eab80decda8eaafc29d4bbb81407ee8 /arch/cris | |
parent | 0c4f6d6bd17bbcf165a2439b59b9e8212c19f645 (diff) |
cris: Use generic init_task
Same code. Use the generic version.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Link: http://lkml.kernel.org/r/20120503085034.475552133@linutronix.de
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/Kconfig | 1 | ||||
-rw-r--r-- | arch/cris/kernel/process.c | 28 |
2 files changed, 1 insertions, 28 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 2995035812ec..15e30a771a72 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -50,6 +50,7 @@ config CRIS | |||
50 | select GENERIC_IRQ_SHOW | 50 | select GENERIC_IRQ_SHOW |
51 | select GENERIC_IOMAP | 51 | select GENERIC_IOMAP |
52 | select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32 | 52 | select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32 |
53 | select HAVE_GENERIC_INIT_TASK | ||
53 | 54 | ||
54 | config HZ | 55 | config HZ |
55 | int | 56 | int |
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c index 891dad85e8bd..66fd01728790 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c | |||
@@ -29,34 +29,6 @@ | |||
29 | //#define DEBUG | 29 | //#define DEBUG |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * Initial task structure. Make this a per-architecture thing, | ||
33 | * because different architectures tend to have different | ||
34 | * alignment requirements and potentially different initial | ||
35 | * setup. | ||
36 | */ | ||
37 | |||
38 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | ||
39 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | ||
40 | /* | ||
41 | * Initial thread structure. | ||
42 | * | ||
43 | * We need to make sure that this is 8192-byte aligned due to the | ||
44 | * way process stacks are handled. This is done by having a special | ||
45 | * "init_task" linker map entry.. | ||
46 | */ | ||
47 | union thread_union init_thread_union __init_task_data = | ||
48 | { INIT_THREAD_INFO(init_task) }; | ||
49 | |||
50 | /* | ||
51 | * Initial task structure. | ||
52 | * | ||
53 | * All other task structs will be allocated on slabs in fork.c | ||
54 | */ | ||
55 | struct task_struct init_task = INIT_TASK(init_task); | ||
56 | |||
57 | EXPORT_SYMBOL(init_task); | ||
58 | |||
59 | /* | ||
60 | * The hlt_counter, disable_hlt and enable_hlt is just here as a hook if | 32 | * The hlt_counter, disable_hlt and enable_hlt is just here as a hook if |
61 | * there would ever be a halt sequence (for power save when idle) with | 33 | * there would ever be a halt sequence (for power save when idle) with |
62 | * some largish delay when halting or resuming *and* a driver that can't | 34 | * some largish delay when halting or resuming *and* a driver that can't |