diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-03 05:02:57 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-05 07:00:25 -0400 |
commit | b0ce50aa89edd82aaadc57e8c774f714ede6101d (patch) | |
tree | 03ef763c63926c9a15ff16041f4bc0eda3aa785e /arch | |
parent | c39f52a9edc5e0687cbb54c08bcd78cf7fe26b62 (diff) |
powerpc: Use generic init_task
Same code. Use the generic version.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Link: http://lkml.kernel.org/r/20120503085035.211123184@linutronix.de
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/init_task.c | 29 |
3 files changed, 2 insertions, 30 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c81553508366..946e8816ecd3 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -145,6 +145,7 @@ config PPC | |||
145 | select HAVE_ARCH_JUMP_LABEL | 145 | select HAVE_ARCH_JUMP_LABEL |
146 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 146 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
147 | select GENERIC_SMP_IDLE_THREAD | 147 | select GENERIC_SMP_IDLE_THREAD |
148 | select HAVE_GENERIC_INIT_TASK | ||
148 | 149 | ||
149 | config EARLY_PRINTK | 150 | config EARLY_PRINTK |
150 | bool | 151 | bool |
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index f5808a35688c..83afacd3ba7b 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile | |||
@@ -28,7 +28,7 @@ endif | |||
28 | 28 | ||
29 | obj-y := cputable.o ptrace.o syscalls.o \ | 29 | obj-y := cputable.o ptrace.o syscalls.o \ |
30 | irq.o align.o signal_32.o pmc.o vdso.o \ | 30 | irq.o align.o signal_32.o pmc.o vdso.o \ |
31 | init_task.o process.o systbl.o idle.o \ | 31 | process.o systbl.o idle.o \ |
32 | signal.o sysfs.o cacheinfo.o time.o \ | 32 | signal.o sysfs.o cacheinfo.o time.o \ |
33 | prom.o traps.o setup-common.o \ | 33 | prom.o traps.o setup-common.o \ |
34 | udbg.o misc.o io.o dma.o \ | 34 | udbg.o misc.o io.o dma.o \ |
diff --git a/arch/powerpc/kernel/init_task.c b/arch/powerpc/kernel/init_task.c deleted file mode 100644 index d076d465dbd1..000000000000 --- a/arch/powerpc/kernel/init_task.c +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | #include <linux/mm.h> | ||
2 | #include <linux/export.h> | ||
3 | #include <linux/sched.h> | ||
4 | #include <linux/init.h> | ||
5 | #include <linux/init_task.h> | ||
6 | #include <linux/fs.h> | ||
7 | #include <linux/mqueue.h> | ||
8 | #include <asm/uaccess.h> | ||
9 | |||
10 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | ||
11 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | ||
12 | /* | ||
13 | * Initial thread structure. | ||
14 | * | ||
15 | * We need to make sure that this is 16384-byte aligned due to the | ||
16 | * way process stacks are handled. This is done by having a special | ||
17 | * "init_task" linker map entry.. | ||
18 | */ | ||
19 | union thread_union init_thread_union __init_task_data = | ||
20 | { INIT_THREAD_INFO(init_task) }; | ||
21 | |||
22 | /* | ||
23 | * Initial task structure. | ||
24 | * | ||
25 | * All other task structs will be allocated on slabs in fork.c | ||
26 | */ | ||
27 | struct task_struct init_task = INIT_TASK(init_task); | ||
28 | |||
29 | EXPORT_SYMBOL(init_task); | ||