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()"

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()"
7e2cec86 · Linus Torvalds · 0a4cf2c8 · 12de512a · 7e2cec86 · 7e2cec86
Commit 7e2cec86 authored Nov 11, 2008 by Linus Torvalds
Expand all Show whitespace changes
Inline Side-by-side

Showing with 195 additions and 38 deletions

arch/sparc/kernel/head.S arch/sparc/kernel/head.S +0 -1

arch/sparc64/defconfig arch/sparc64/defconfig +195 -37

No files found.
--- 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

--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig