diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-03 05:02:55 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-05 07:00:24 -0400 |
commit | 16caadb8c8f8461b853bd3a310d7730cf5a0aec4 (patch) | |
tree | 38b5f7deaec2e239c572d33a4cb992df1efb5e28 /arch/microblaze | |
parent | ab5fc1ffb97e670226166f31e61a2cdc51dd2edc (diff) |
microblaze: Use generic init_task
Same code. Use the generic version.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Michal Simek <monstr@monstr.eu>
Link: http://lkml.kernel.org/r/20120503085034.881532838@linutronix.de
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/Kconfig | 1 | ||||
-rw-r--r-- | arch/microblaze/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/microblaze/kernel/init_task.c | 26 |
3 files changed, 2 insertions, 27 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index ac22dc7f4cab..21ccba6a05f9 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
@@ -22,6 +22,7 @@ config MICROBLAZE | |||
22 | select GENERIC_PCI_IOMAP | 22 | select GENERIC_PCI_IOMAP |
23 | select GENERIC_CPU_DEVICES | 23 | select GENERIC_CPU_DEVICES |
24 | select GENERIC_ATOMIC64 | 24 | select GENERIC_ATOMIC64 |
25 | select HAVE_GENERIC_INIT_TASK | ||
25 | 26 | ||
26 | config SWAP | 27 | config SWAP |
27 | def_bool n | 28 | def_bool n |
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile index 494b63b72dd7..928c950fc14c 100644 --- a/arch/microblaze/kernel/Makefile +++ b/arch/microblaze/kernel/Makefile | |||
@@ -16,7 +16,7 @@ endif | |||
16 | extra-y := head.o vmlinux.lds | 16 | extra-y := head.o vmlinux.lds |
17 | 17 | ||
18 | obj-y += dma.o exceptions.o \ | 18 | obj-y += dma.o exceptions.o \ |
19 | hw_exception_handler.o init_task.o intc.o irq.o \ | 19 | hw_exception_handler.o intc.o irq.o \ |
20 | process.o prom.o prom_parse.o ptrace.o \ | 20 | process.o prom.o prom_parse.o ptrace.o \ |
21 | reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o | 21 | reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o |
22 | 22 | ||
diff --git a/arch/microblaze/kernel/init_task.c b/arch/microblaze/kernel/init_task.c deleted file mode 100644 index b5d711f94ff8..000000000000 --- a/arch/microblaze/kernel/init_task.c +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2009 Michal Simek <monstr@monstr.eu> | ||
3 | * Copyright (C) 2009 PetaLogix | ||
4 | * Copyright (C) 2006 Atmark Techno, Inc. | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
9 | */ | ||
10 | |||
11 | #include <linux/module.h> | ||
12 | #include <linux/sched.h> | ||
13 | #include <linux/init_task.h> | ||
14 | #include <linux/fs.h> | ||
15 | #include <linux/mqueue.h> | ||
16 | |||
17 | #include <asm/pgtable.h> | ||
18 | |||
19 | static struct signal_struct init_signals = INIT_SIGNALS(init_signals); | ||
20 | static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); | ||
21 | |||
22 | union thread_union init_thread_union __init_task_data = | ||
23 | { INIT_THREAD_INFO(init_task) }; | ||
24 | |||
25 | struct task_struct init_task = INIT_TASK(init_task); | ||
26 | EXPORT_SYMBOL(init_task); | ||