Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[karo-tx-linux.git] / arch / sparc / include / asm / switch_to_64.h

diff --git a/arch/sparc/include/asm/switch_to_64.h b/arch/sparc/include/asm/switch_to_64.h
index c7de3323819c5389a8c1855f09aa542cd67f4d41..8d284801f2322ec26f35bdd7b4e4953ccf993bc8 100644 (file)
--- a/arch/sparc/include/asm/switch_to_64.h
+++ b/arch/sparc/include/asm/switch_to_64.h
@@ -48,8 +48,8 @@ do {  save_and_clear_fpu();                                           \
        "wrpr   %%g0, 14, %%pil\n\t"                                    \
        "brz,pt %%o7, switch_to_pc\n\t"                                 \
        " mov   %%g7, %0\n\t"                                           \
-       "sethi  %%hi(ret_from_syscall), %%g1\n\t"                       \
-       "jmpl   %%g1 + %%lo(ret_from_syscall), %%g0\n\t"                \
+       "sethi  %%hi(ret_from_fork), %%g1\n\t"                          \
+       "jmpl   %%g1 + %%lo(ret_from_fork), %%g0\n\t"                   \
        " nop\n\t"                                                      \
        ".globl switch_to_pc\n\t"                                       \
        "switch_to_pc:\n\t"                                             \