sparc: unify kernel/init_task

A closer inspection revealed that these two files had identical functionality - but the implementation of it differed slightly. Base it on the sparc version as it was the best. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Dec 4, 2008 · b28017f · b28017f
1 parent 757498c
commit b28017f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 37 deletions.
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
@@ -68,7 +68,7 @@ endif
 endif
 
 head-y                 := arch/sparc/kernel/head_$(BITS).o
-head-y                 += arch/sparc/kernel/init_task_$(BITS).o
+head-y                 += arch/sparc/kernel/init_task.o
 
 core-y                 += arch/sparc/kernel/
 core-y                 += arch/sparc/mm/ arch/sparc/math-emu/

diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
@@ -6,7 +6,7 @@ asflags-y := -ansi
 ccflags-y := -Werror
 
 extra-y     := head_$(BITS).o
-extra-y     += init_task_$(BITS).o
+extra-y     += init_task.o
 extra-y     += vmlinux.lds
 
 obj-$(CONFIG_SPARC32)   += entry.o wof.o wuf.o

diff --git a/arch/sparc/kernel/init_task_32.c → arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task_32.c → arch/sparc/kernel/init_task.c
diff --git a/arch/sparc/kernel/init_task_64.c b/arch/sparc/kernel/init_task_64.c