From f84daa667b37dde8eb9d830bc0b0a45a859c75cc Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Sat, 4 May 2013 19:16:41 +0000 Subject: [PATCH] --- yaml --- r: 374270 b: refs/heads/master c: bbbfde782084b4f0d85ddffb88f1cf4650ff40e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/entry.S | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 33bf86e6e93d..3ae70e83f61e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93782eba49e23c3f311a6b05a19ba15927ec4e8b +refs/heads/master: bbbfde782084b4f0d85ddffb88f1cf4650ff40e4 diff --git a/trunk/arch/parisc/kernel/entry.S b/trunk/arch/parisc/kernel/entry.S index aa486e46ab97..36f4f1dcb778 100644 --- a/trunk/arch/parisc/kernel/entry.S +++ b/trunk/arch/parisc/kernel/entry.S @@ -1702,7 +1702,8 @@ ENTRY(sys_\name\()_wrapper) ldo TASK_REGS(%r1),%r1 reg_save %r1 mfctl %cr27, %r28 - b sys_\name + ldil L%sys_\name, %r31 + be R%sys_\name(%sr4,%r31) STREG %r28, PT_CR27(%r1) ENDPROC(sys_\name\()_wrapper) .endm