---

yaml --- r: 123363 b: refs/heads/master c: b28017f h: refs/heads/master i: 123361: 9a5a8ea 123359: 786d32c v: v3
git-mirror · Dec 4, 2008 · 17931ab · 17931ab
1 parent 6210911
commit 17931ab
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 38 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 757498c63ed70ec8961aa432173247f4373ef0c3
+refs/heads/master: b28017f57f1ec16ab515e99d863bf9f33ea0d737
diff --git a/trunk/arch/sparc/Makefile b/trunk/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/trunk/arch/sparc/kernel/Makefile b/trunk/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/trunk/arch/sparc/kernel/init_task_32.c → trunk/arch/sparc/kernel/init_task.c b/trunk/arch/sparc/kernel/init_task_32.c → trunk/arch/sparc/kernel/init_task.c
diff --git a/trunk/arch/sparc/kernel/init_task_64.c b/trunk/arch/sparc/kernel/init_task_64.c