diff for duplicates of <20120519133712.GA11514@ZenIV.linux.org.uk> diff --git a/a/1.txt b/N1/1.txt index 46a83b2..431a84a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -86,3 +86,19 @@ index 12c1ed3..369b1c4 100644 regs->gr[31] -= 8; - /* Preserve original r28. */ - regs->gr[28] = regs->orig_r28; +- + return; + } + default: +diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S +index 82a52b2..54a9cbf 100644 +--- a/arch/parisc/kernel/syscall.S ++++ b/arch/parisc/kernel/syscall.S +@@ -156,7 +156,7 @@ linux_gateway_entry: + STREG %r26, TASK_PT_GR26(%r1) /* 1st argument */ + STREG %r27, TASK_PT_GR27(%r1) /* user dp */ + STREG %r28, TASK_PT_GR28(%r1) /* return value 0 */ +- STREG %r28, TASK_PT_ORIG_R28(%r1) /* return value 0 (saved for signals) */ ++ STREG %r0, TASK_PT_ORIG_R28(%r1) /* don't prohibit restarts */ + STREG %r29, TASK_PT_GR29(%r1) /* return value 1 */ + STREG %r31, TASK_PT_GR31(%r1) /* preserve syscall return ptr */ diff --git a/a/content_digest b/N1/content_digest index 27d63ab..67561ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -103,6 +103,22 @@ " \t\t */\n" " \t\tregs->gr[31] -= 8;\n" "-\t\t/* Preserve original r28. */\n" - "-\t\tregs->gr[28] = regs->orig_r28;" + "-\t\tregs->gr[28] = regs->orig_r28;\n" + "-\n" + " \t\treturn;\n" + " \t}\n" + " \tdefault:\n" + "diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S\n" + "index 82a52b2..54a9cbf 100644\n" + "--- a/arch/parisc/kernel/syscall.S\n" + "+++ b/arch/parisc/kernel/syscall.S\n" + "@@ -156,7 +156,7 @@ linux_gateway_entry:\n" + " \tSTREG\t%r26, TASK_PT_GR26(%r1)\t \t/* 1st argument */\n" + " \tSTREG\t%r27, TASK_PT_GR27(%r1)\t\t/* user dp */\n" + " \tSTREG %r28, TASK_PT_GR28(%r1) /* return value 0 */\n" + "-\tSTREG %r28, TASK_PT_ORIG_R28(%r1) /* return value 0 (saved for signals) */\n" + "+\tSTREG %r0, TASK_PT_ORIG_R28(%r1) /* don't prohibit restarts */\n" + " \tSTREG\t%r29, TASK_PT_GR29(%r1)\t\t/* return value 1 */\n" + " \tSTREG\t%r31, TASK_PT_GR31(%r1)\t\t/* preserve syscall return ptr */" -fc4c42d25918c090320a67cde53da45cef50106a9a98ce85747b9cc78f3d96cb +c05e36d78312764f457d62456ca9f1234f982318baf6bd07abc88f2a4704379e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.