From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: [patch 05/29] blackfin: Use generic init_task Date: Mon, 30 Apr 2012 20:15:54 -0000 Message-ID: <20120430194845.850346878@linutronix.de> References: <20120430194725.763322463@linutronix.de> Return-path: Content-Disposition: inline; filename=blackfin-use-generic-init-task.patch Sender: linux-kernel-owner@vger.kernel.org To: LKML Cc: linux-arch@vger.kernel.org, Mike Frysinger List-Id: linux-arch.vger.kernel.org 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 Cc: Mike Frysinger --- arch/blackfin/Kconfig | 1 + arch/blackfin/Makefile | 2 -- arch/blackfin/kernel/Makefile | 2 +- arch/blackfin/kernel/init_task.c | 32 -------------------------------- 4 files changed, 2 insertions(+), 35 deletions(-) Index: tip/arch/blackfin/Kconfig =================================================================== --- tip.orig/arch/blackfin/Kconfig +++ tip/arch/blackfin/Kconfig @@ -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 Index: tip/arch/blackfin/Makefile =================================================================== --- tip.orig/arch/blackfin/Makefile +++ tip/arch/blackfin/Makefile @@ -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. Index: tip/arch/blackfin/kernel/Makefile =================================================================== --- tip.orig/arch/blackfin/kernel/Makefile +++ tip/arch/blackfin/kernel/Makefile @@ -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 \ Index: tip/arch/blackfin/kernel/init_task.c =================================================================== --- tip.orig/arch/blackfin/kernel/init_task.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2004-2009 Analog Devices Inc. - * - * Licensed under the GPL-2 or later - */ - -#include -#include -#include -#include -#include - -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)}; From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from www.linutronix.de ([62.245.132.108]:35718 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756813Ab2D3UPz (ORCPT ); Mon, 30 Apr 2012 16:15:55 -0400 Message-ID: <20120430194845.850346878@linutronix.de> Date: Mon, 30 Apr 2012 20:15:54 -0000 From: Thomas Gleixner Subject: [patch 05/29] blackfin: Use generic init_task References: <20120430194725.763322463@linutronix.de> Content-Disposition: inline; filename=blackfin-use-generic-init-task.patch Sender: linux-arch-owner@vger.kernel.org List-ID: To: LKML Cc: linux-arch@vger.kernel.org, Mike Frysinger Message-ID: <20120430201554._9vDcupVpx9gcZNTxWblvH_RAlXEQuLT8BHKUzcAgVs@z> 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 Cc: Mike Frysinger --- arch/blackfin/Kconfig | 1 + arch/blackfin/Makefile | 2 -- arch/blackfin/kernel/Makefile | 2 +- arch/blackfin/kernel/init_task.c | 32 -------------------------------- 4 files changed, 2 insertions(+), 35 deletions(-) Index: tip/arch/blackfin/Kconfig =================================================================== --- tip.orig/arch/blackfin/Kconfig +++ tip/arch/blackfin/Kconfig @@ -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 Index: tip/arch/blackfin/Makefile =================================================================== --- tip.orig/arch/blackfin/Makefile +++ tip/arch/blackfin/Makefile @@ -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. Index: tip/arch/blackfin/kernel/Makefile =================================================================== --- tip.orig/arch/blackfin/kernel/Makefile +++ tip/arch/blackfin/kernel/Makefile @@ -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 \ Index: tip/arch/blackfin/kernel/init_task.c =================================================================== --- tip.orig/arch/blackfin/kernel/init_task.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2004-2009 Analog Devices Inc. - * - * Licensed under the GPL-2 or later - */ - -#include -#include -#include -#include -#include - -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)};