From 67768c0a79c7f7c2164773495d1d0ea9e6767ed1 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 3 May 2012 09:02:52 +0000 Subject: [PATCH] --- yaml --- r: 302799 b: refs/heads/master c: c172ede404d4eda55ed2c0df1c4c11df9311b299 h: refs/heads/master i: 302797: f370773f7d691dcc7ed62011152111ad7e3f4125 302795: 56274c8cdf483174564be83034e5e14442498809 302791: 53a6066867aa7e601e375503f2a4db52ef6524c3 302783: 04e906af49ecac75274f882c9415a2b4870ed477 v: v3 --- [refs] | 2 +- trunk/arch/cris/Kconfig | 1 + trunk/arch/cris/kernel/process.c | 28 ---------------------------- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 9064b6ae6e8b..cd9a6cb8e70f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c4f6d6bd17bbcf165a2439b59b9e8212c19f645 +refs/heads/master: c172ede404d4eda55ed2c0df1c4c11df9311b299 diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig index 2995035812ec..15e30a771a72 100644 --- a/trunk/arch/cris/Kconfig +++ b/trunk/arch/cris/Kconfig @@ -50,6 +50,7 @@ config CRIS select GENERIC_IRQ_SHOW select GENERIC_IOMAP select GENERIC_SMP_IDLE_THREAD if ETRAX_ARCH_V32 + select HAVE_GENERIC_INIT_TASK config HZ int diff --git a/trunk/arch/cris/kernel/process.c b/trunk/arch/cris/kernel/process.c index 891dad85e8bd..66fd01728790 100644 --- a/trunk/arch/cris/kernel/process.c +++ b/trunk/arch/cris/kernel/process.c @@ -28,34 +28,6 @@ //#define DEBUG -/* - * Initial task structure. Make this a per-architecture thing, - * because different architectures tend to have different - * alignment requirements and potentially different initial - * setup. - */ - -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); - /* * The hlt_counter, disable_hlt and enable_hlt is just here as a hook if * there would ever be a halt sequence (for power save when idle) with