Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 409ee245 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge the init_task code for mmu and non-mmu targets 



The init_task code can be the same for both mmu and non-mmu targets.
None of the alignment carried out in the the current init_task code
is necessary. The linker script takes care of aligning the init_thread
structure to a THREAD SIZE boundary, and that is all we need.

So use the init_task.c code for all target types, that makes m68k
code consistent with what most other architectures do.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent ed3da2c4

arch/m68k/kernel/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -6,15 +6,12 @@ extra-$(CONFIG_MMU) := head.o 
extra-$(CONFIG_SUN3)	:= sun3-head.o

extra-y			+= vmlinux.lds



obj-y	:= entry.o irq.o m68k_ksyms.o module.o process.o ptrace.o setup.o \

	   signal.o sys_m68k.o syscalltable.o time.o traps.o

obj-y	:= entry.o init_task.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)	+= ints.o vectors.o



ifndef CONFIG_MMU_SUN3

obj-y			+= dma.o

endif

ifndef CONFIG_MMU

obj-y			+= init_task.o

endif

arch/m68k/kernel/init_task.c

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); 
 *

 * All other task structs will be allocated on slabs in fork.c

 */

__asm__(".align 4");

struct task_struct init_task = INIT_TASK(init_task);



EXPORT_SYMBOL(init_task);
@@ -27,7 +26,7 @@ EXPORT_SYMBOL(init_task); 
/*

 * Initial thread structure.

 *

 * We need to make sure that this is 8192-byte aligned due to the

 * 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..

 */

arch/m68k/kernel/process_mm.c

+0 −16
Original line number Diff line number Diff line
@@ -33,22 +33,6 @@ 
#include <asm/setup.h>

#include <asm/pgtable.h>



/*

 * Initial task/thread structure. Make this a per-architecture thing,

 * because different architectures tend to have different

 * alignment requirements and potentially different initial

 * setup.

 */

static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

union thread_union init_thread_union __init_task_data

	__attribute__((aligned(THREAD_SIZE))) =

		{ INIT_THREAD_INFO(init_task) };



/* initial task structure */

struct task_struct init_task = INIT_TASK(init_task);



EXPORT_SYMBOL(init_task);



asmlinkage void ret_from_fork(void);