From e9cee3f85775d2464cb7384f10b49e5aee551709 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 3 May 2012 09:02:56 +0000 Subject: [PATCH] --- yaml --- r: 302808 b: refs/heads/master c: cf5e6def83fabdf10a05dc5a5981eda1672cb79c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/openrisc/Kconfig | 1 + trunk/arch/openrisc/Makefile | 2 +- trunk/arch/openrisc/kernel/Makefile | 2 +- trunk/arch/openrisc/kernel/init_task.c | 42 -------------------------- 5 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 trunk/arch/openrisc/kernel/init_task.c diff --git a/[refs] b/[refs] index e0738e86ad69..b26fbc4cf4c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe285f523bc13185da6d4c740655b2c27c75cf13 +refs/heads/master: cf5e6def83fabdf10a05dc5a5981eda1672cb79c diff --git a/trunk/arch/openrisc/Kconfig b/trunk/arch/openrisc/Kconfig index a4787197d8fe..6d921936f4ab 100644 --- a/trunk/arch/openrisc/Kconfig +++ b/trunk/arch/openrisc/Kconfig @@ -17,6 +17,7 @@ config OPENRISC select GENERIC_IOMAP select GENERIC_CPU_DEVICES select GENERIC_ATOMIC64 + select HAVE_GENERIC_INIT_TASK config MMU def_bool y diff --git a/trunk/arch/openrisc/Makefile b/trunk/arch/openrisc/Makefile index 158ae4c0dc6c..966886c8daf5 100644 --- a/trunk/arch/openrisc/Makefile +++ b/trunk/arch/openrisc/Makefile @@ -38,7 +38,7 @@ else KBUILD_CFLAGS += $(call cc-option,-msoft-div) endif -head-y := arch/openrisc/kernel/head.o arch/openrisc/kernel/init_task.o +head-y := arch/openrisc/kernel/head.o core-y += arch/openrisc/lib/ \ arch/openrisc/kernel/ \ diff --git a/trunk/arch/openrisc/kernel/Makefile b/trunk/arch/openrisc/kernel/Makefile index 9a4c2706d795..e1ee0fa2bbda 100644 --- a/trunk/arch/openrisc/kernel/Makefile +++ b/trunk/arch/openrisc/kernel/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux kernel. # -extra-y := head.o vmlinux.lds init_task.o +extra-y := head.o vmlinux.lds obj-y := setup.o idle.o or32_ksyms.o process.o dma.o \ traps.o time.o irq.o entry.o ptrace.o signal.o sys_or32.o \ diff --git a/trunk/arch/openrisc/kernel/init_task.c b/trunk/arch/openrisc/kernel/init_task.c deleted file mode 100644 index ca534082d5f3..000000000000 --- a/trunk/arch/openrisc/kernel/init_task.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * OpenRISC init_task.c - * - * Linux architectural port borrowing liberally from similar works of - * others. All original copyrights apply as per the original source - * declaration. - * - * Modifications for the OpenRISC architecture: - * Copyright (C) 2003 Matjaz Breskvar - * Copyright (C) 2010-2011 Jonas Bonn - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -#include -#include -#include - -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 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) -}; - -/* - * 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);