mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
arm: Use generic init_task
Same code. Use the generic version. The special Makefile treatment is pointless anyway as init_task.o contains only data which is handled by the linker script. So no point on being treated like head text. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Russell King <linux@arm.linux.org.uk> Link: http://lkml.kernel.org/r/20120503085034.221811388@linutronix.de
This commit is contained in:
parent
5dced29d71
commit
5290dc2929
4 changed files with 3 additions and 39 deletions
|
@ -35,6 +35,7 @@ config ARM
|
||||||
select GENERIC_PCI_IOMAP
|
select GENERIC_PCI_IOMAP
|
||||||
select HAVE_BPF_JIT if NET
|
select HAVE_BPF_JIT if NET
|
||||||
select GENERIC_SMP_IDLE_THREAD
|
select GENERIC_SMP_IDLE_THREAD
|
||||||
|
select HAVE_GENERIC_INIT_TASK
|
||||||
help
|
help
|
||||||
The ARM series is a line of low-power-consumption RISC chip designs
|
The ARM series is a line of low-power-consumption RISC chip designs
|
||||||
licensed by ARM Ltd and targeted at embedded applications and
|
licensed by ARM Ltd and targeted at embedded applications and
|
||||||
|
|
|
@ -119,7 +119,7 @@ KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_THUMB2) $(arch-y) $(tune-y) -include asm/
|
||||||
CHECKFLAGS += -D__arm__
|
CHECKFLAGS += -D__arm__
|
||||||
|
|
||||||
#Default value
|
#Default value
|
||||||
head-y := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o
|
head-y := arch/arm/kernel/head$(MMUEXT).o
|
||||||
textofs-y := 0x00008000
|
textofs-y := 0x00008000
|
||||||
textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
|
textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
|
||||||
# We don't want the htc bootloader to corrupt kernel during resume
|
# We don't want the htc bootloader to corrupt kernel during resume
|
||||||
|
|
|
@ -81,4 +81,4 @@ head-y := head$(MMUEXT).o
|
||||||
obj-$(CONFIG_DEBUG_LL) += debug.o
|
obj-$(CONFIG_DEBUG_LL) += debug.o
|
||||||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||||
|
|
||||||
extra-y := $(head-y) init_task.o vmlinux.lds
|
extra-y := $(head-y) vmlinux.lds
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
/*
|
|
||||||
* linux/arch/arm/kernel/init_task.c
|
|
||||||
*/
|
|
||||||
#include <linux/mm.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/fs.h>
|
|
||||||
#include <linux/sched.h>
|
|
||||||
#include <linux/init.h>
|
|
||||||
#include <linux/init_task.h>
|
|
||||||
#include <linux/mqueue.h>
|
|
||||||
#include <linux/uaccess.h>
|
|
||||||
|
|
||||||
#include <asm/pgtable.h>
|
|
||||||
|
|
||||||
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 making sure
|
|
||||||
* the linker maps this in the .text segment right after head.S,
|
|
||||||
* and making head.S ensure the proper alignment.
|
|
||||||
*
|
|
||||||
* The things we do for performance..
|
|
||||||
*/
|
|
||||||
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);
|
|
Loading…
Reference in a new issue