Commit 293ef7b8 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

tile: 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: Chris Metcalf <cmetcalf@tilera.com>
Link: http://lkml.kernel.org/r/20120503085035.528129988@linutronix.de
parent 3f149aa2

arch/tile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config TILE 
	select GENERIC_IRQ_SHOW

	select SYS_HYPERVISOR

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select HAVE_GENERIC_INIT_TASK



# FIXME: investigate whether we need/want these options.

#	select HAVE_IOREMAP_PROT

arch/tile/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



extra-y := vmlinux.lds head_$(BITS).o

obj-y := backtrace.o entry.o init_task.o irq.o messaging.o \

obj-y := backtrace.o entry.o irq.o messaging.o \

	pci-dma.o proc.o process.o ptrace.o reboot.o \

	setup.o signal.o single_step.o stack.o sys.o sysfs.o time.o traps.o \

	intvec_$(BITS).o regs_$(BITS).o tile-desc_$(BITS).o

arch/tile/kernel/init_task.c

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

 * Copyright 2010 Tilera Corporation. All Rights Reserved.

 *

 *   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, version 2.

 *

 *   This program is distributed in the hope that it will be useful, but

 *   WITHOUT ANY WARRANTY; without even the implied warranty of

 *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or

 *   NON INFRINGEMENT.  See the GNU General Public License for

 *   more details.

 */



#include <linux/mm.h>

#include <linux/fs.h>

#include <linux/init_task.h>

#include <linux/mqueue.h>

#include <linux/module.h>

#include <linux/start_kernel.h>

#include <linux/uaccess.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 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);



/*

 * per-CPU stack and boot info.

 */

DEFINE_PER_CPU(unsigned long, boot_sp) =

	(unsigned long)init_stack + THREAD_SIZE;



#ifdef CONFIG_SMP

DEFINE_PER_CPU(unsigned long, boot_pc) = (unsigned long)start_kernel;

#else

/*

 * The variable must be __initdata since it references __init code.

 * With CONFIG_SMP it is per-cpu data, which is exempt from validation.

 */

unsigned long __initdata boot_pc = (unsigned long)start_kernel;

#endif

arch/tile/kernel/setup.c

+16 −0
Original line number Diff line number Diff line
@@ -61,6 +61,22 @@ unsigned long __initdata node_free_pfn[MAX_NUMNODES]; 


static unsigned long __initdata node_percpu[MAX_NUMNODES];



/*

 * per-CPU stack and boot info.

 */

DEFINE_PER_CPU(unsigned long, boot_sp) =

	(unsigned long)init_stack + THREAD_SIZE;



#ifdef CONFIG_SMP

DEFINE_PER_CPU(unsigned long, boot_pc) = (unsigned long)start_kernel;

#else

/*

 * The variable must be __initdata since it references __init code.

 * With CONFIG_SMP it is per-cpu data, which is exempt from validation.

 */

unsigned long __initdata boot_pc = (unsigned long)start_kernel;

#endif



#ifdef CONFIG_HIGHMEM

/* Page frame index of end of lowmem on each controller. */

unsigned long __cpuinitdata node_lowmem_end_pfn[MAX_NUMNODES];