From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: [patch 13/29] m68k: Use generic init_task Date: Mon, 30 Apr 2012 20:15:58 -0000 Message-ID: <20120430194846.352679965@linutronix.de> References: <20120430194725.763322463@linutronix.de> Return-path: Content-Disposition: inline; filename=m68k-use-generic-init-task.patch Sender: linux-kernel-owner@vger.kernel.org To: LKML Cc: linux-arch@vger.kernel.org, Geert Uytterhoeven List-Id: linux-arch.vger.kernel.org Same code. Use the generic version. Signed-off-by: Thomas Gleixner Cc: Geert Uytterhoeven --- arch/m68k/Kconfig | 1 + arch/m68k/kernel/Makefile | 2 +- arch/m68k/kernel/init_task.c | 35 ----------------------------------- 3 files changed, 2 insertions(+), 36 deletions(-) Index: tip/arch/m68k/Kconfig =================================================================== --- tip.orig/arch/m68k/Kconfig +++ tip/arch/m68k/Kconfig @@ -8,6 +8,7 @@ config M68K select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS select GENERIC_CPU_DEVICES select FPU if MMU + select HAVE_GENERIC_INIT_TASK config RWSEM_GENERIC_SPINLOCK bool Index: tip/arch/m68k/kernel/Makefile =================================================================== --- tip.orig/arch/m68k/kernel/Makefile +++ tip/arch/m68k/kernel/Makefile @@ -13,7 +13,7 @@ extra-$(CONFIG_SUN3X) := head.o extra-$(CONFIG_SUN3) := sun3-head.o extra-y += vmlinux.lds -obj-y := entry.o init_task.o irq.o m68k_ksyms.o module.o process.o ptrace.o +obj-y := entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o obj-y += setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o Index: tip/arch/m68k/kernel/init_task.c =================================================================== --- tip.orig/arch/m68k/kernel/init_task.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * linux/arch/m68knommu/kernel/init_task.c - */ -#include -#include -#include -#include -#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 THREAD size 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]:35750 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756859Ab2D3UP7 (ORCPT ); Mon, 30 Apr 2012 16:15:59 -0400 Message-ID: <20120430194846.352679965@linutronix.de> Date: Mon, 30 Apr 2012 20:15:58 -0000 From: Thomas Gleixner Subject: [patch 13/29] m68k: Use generic init_task References: <20120430194725.763322463@linutronix.de> Content-Disposition: inline; filename=m68k-use-generic-init-task.patch Sender: linux-arch-owner@vger.kernel.org List-ID: To: LKML Cc: linux-arch@vger.kernel.org, Geert Uytterhoeven Message-ID: <20120430201558.Yc-qFVjFUZYT7Gw_4LmtcVWQMVlF6s0Q585CutVsCJg@z> Same code. Use the generic version. Signed-off-by: Thomas Gleixner Cc: Geert Uytterhoeven --- arch/m68k/Kconfig | 1 + arch/m68k/kernel/Makefile | 2 +- arch/m68k/kernel/init_task.c | 35 ----------------------------------- 3 files changed, 2 insertions(+), 36 deletions(-) Index: tip/arch/m68k/Kconfig =================================================================== --- tip.orig/arch/m68k/Kconfig +++ tip/arch/m68k/Kconfig @@ -8,6 +8,7 @@ config M68K select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS select GENERIC_CPU_DEVICES select FPU if MMU + select HAVE_GENERIC_INIT_TASK config RWSEM_GENERIC_SPINLOCK bool Index: tip/arch/m68k/kernel/Makefile =================================================================== --- tip.orig/arch/m68k/kernel/Makefile +++ tip/arch/m68k/kernel/Makefile @@ -13,7 +13,7 @@ extra-$(CONFIG_SUN3X) := head.o extra-$(CONFIG_SUN3) := sun3-head.o extra-y += vmlinux.lds -obj-y := entry.o init_task.o irq.o m68k_ksyms.o module.o process.o ptrace.o +obj-y := entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o obj-y += setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o obj-$(CONFIG_MMU_MOTOROLA) += ints.o vectors.o Index: tip/arch/m68k/kernel/init_task.c =================================================================== --- tip.orig/arch/m68k/kernel/init_task.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * linux/arch/m68knommu/kernel/init_task.c - */ -#include -#include -#include -#include -#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 THREAD size 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) }; -