Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Update defconfig. Revert "sparc: correct section of current_pc()"
Dark-Matter7232 · Nov 11, 2008 · 7e2cec8 · 7e2cec8
2 parents 0a4cf2c + 12de512
commit 7e2cec8
Show file tree

Hide file tree

Showing 2 changed files with 195 additions and 38 deletions.
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
@@ -465,7 +465,6 @@ gokernel:
 		mov	%o7, %g4		! Save %o7
 
 		/* Jump to it, and pray... */
-		__INIT
 current_pc:
 		call	1f
 		 nop
-Original file line number
+Diff line change
@@ Expand Up / @@ -465,7 +465,6 @@ gokernel: @@
     		mov	%o7, %g4		! Save %o7
     		/* Jump to it, and pray... */
-    		__INIT
     current_pc:
     		call	1f
     		 nop
@@ Expand Down @@