Commit 6e3e8449 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

blackfin: 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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Link: http://lkml.kernel.org/r/20120503085034.350246420@linutronix.de
parent 29b2501b

arch/blackfin/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config BLACKFIN 
	select IRQ_PER_CPU if SMP

	select HAVE_NMI_WATCHDOG if NMI_WATCHDOG

	select GENERIC_SMP_IDLE_THREAD

	select HAVE_GENERIC_INIT_TASK



config GENERIC_CSUM

	def_bool y

arch/blackfin/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ KBUILD_AFLAGS += -mcpu=$(CPU_REV) 
CHECKFLAGS_SILICON = $(shell echo "" | $(CPP) $(KBUILD_CFLAGS) -dD - 2>/dev/null | awk '$$2 == "__SILICON_REVISION__" { print $$3 }')

CHECKFLAGS += -D__SILICON_REVISION__=$(CHECKFLAGS_SILICON) -D__bfin__



head-y   := arch/$(ARCH)/kernel/init_task.o



core-y   += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/ arch/$(ARCH)/mach-common/



# If we have a machine-specific directory, then include it in the build.

arch/blackfin/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# arch/blackfin/kernel/Makefile

#



extra-y := init_task.o vmlinux.lds

extra-y := vmlinux.lds



obj-y := \

	entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \

arch/blackfin/kernel/init_task.c

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright 2004-2009 Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later

 */



#include <linux/mm.h>

#include <linux/module.h>

#include <linux/init_task.h>

#include <linux/mqueue.h>

#include <linux/fs.h>



static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

/*

 * 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);



/*

 * 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)};