Commit 9e5869f8 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull a sparc fix from David Miller.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Do not clobber %g2 in xcall_fetch_glob_regs().
parents f3b26922 a5a737e0
...@@ -269,4 +269,4 @@ static int __init sunfire_init(void) ...@@ -269,4 +269,4 @@ static int __init sunfire_init(void)
return 0; return 0;
} }
subsys_initcall(sunfire_init); fs_initcall(sunfire_init);
...@@ -495,11 +495,11 @@ xcall_fetch_glob_regs: ...@@ -495,11 +495,11 @@ xcall_fetch_glob_regs:
stx %o7, [%g1 + GR_SNAP_O7] stx %o7, [%g1 + GR_SNAP_O7]
stx %i7, [%g1 + GR_SNAP_I7] stx %i7, [%g1 + GR_SNAP_I7]
/* Don't try this at home kids... */ /* Don't try this at home kids... */
rdpr %cwp, %g2 rdpr %cwp, %g3
sub %g2, 1, %g7 sub %g3, 1, %g7
wrpr %g7, %cwp wrpr %g7, %cwp
mov %i7, %g7 mov %i7, %g7
wrpr %g2, %cwp wrpr %g3, %cwp
stx %g7, [%g1 + GR_SNAP_RPC] stx %g7, [%g1 + GR_SNAP_RPC]
sethi %hi(trap_block), %g7 sethi %hi(trap_block), %g7
or %g7, %lo(trap_block), %g7 or %g7, %lo(trap_block), %g7
......
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