From ae4371693afb864bc5aee402127088570e0f8c38 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 9 Dec 2012 06:16:14 +0000 Subject: [PATCH] --- yaml --- r: 356314 b: refs/heads/master c: 52ab532ea76d30b7e7a7b98021e2e873e83029a5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/syscall.S | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0af8d501759c..b60685364705 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 872420b3b869d47b1f1dd93418c34e306d962668 +refs/heads/master: 52ab532ea76d30b7e7a7b98021e2e873e83029a5 diff --git a/trunk/arch/parisc/kernel/syscall.S b/trunk/arch/parisc/kernel/syscall.S index 86742df0b194..5e055240f00b 100644 --- a/trunk/arch/parisc/kernel/syscall.S +++ b/trunk/arch/parisc/kernel/syscall.S @@ -309,10 +309,13 @@ tracesys_next: LDREG TASK_PT_GR25(%r1), %r25 LDREG TASK_PT_GR24(%r1), %r24 LDREG TASK_PT_GR23(%r1), %r23 -#ifdef CONFIG_64BIT LDREG TASK_PT_GR22(%r1), %r22 LDREG TASK_PT_GR21(%r1), %r21 +#ifdef CONFIG_64BIT ldo -16(%r30),%r29 /* Reference param save area */ +#else + stw %r22, -52(%r30) /* 5th argument */ + stw %r21, -56(%r30) /* 6th argument */ #endif comiclr,>>= __NR_Linux_syscalls, %r20, %r0