Commit 7e2cec86 authored by Linus Torvalds's avatar Linus Torvalds

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()"
parents 0a4cf2c8 12de512a
...@@ -465,7 +465,6 @@ gokernel: ...@@ -465,7 +465,6 @@ gokernel:
mov %o7, %g4 ! Save %o7 mov %o7, %g4 ! Save %o7
/* Jump to it, and pray... */ /* Jump to it, and pray... */
__INIT
current_pc: current_pc:
call 1f call 1f
nop nop
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment