summaryrefslogtreecommitdiff
path: root/arch/parisc/include/asm/syscall.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-04-04 09:51:08 (GMT)
committerTakashi Iwai <tiwai@suse.de>2016-04-04 09:51:08 (GMT)
commita99e31512aa435e8391ba5f5e64abeac9c5f2f32 (patch)
tree56bb9d9ccfe76520b672249757e25f686275b204 /arch/parisc/include/asm/syscall.h
parent86c8dd7f4da3fb3f92fc5ab5144c971639d39745 (diff)
parentf03b24a851d32ca85dacab01785b24a7ee717d37 (diff)
downloadlinux-a99e31512aa435e8391ba5f5e64abeac9c5f2f32.tar.xz
Merge branch 'for-linus' into for-next
Conflicts: sound/hda/hdac_i915.c Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/parisc/include/asm/syscall.h')
-rw-r--r--arch/parisc/include/asm/syscall.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/syscall.h b/arch/parisc/include/asm/syscall.h
index a5eba95..637ce8d 100644
--- a/arch/parisc/include/asm/syscall.h
+++ b/arch/parisc/include/asm/syscall.h
@@ -39,6 +39,19 @@ static inline void syscall_get_arguments(struct task_struct *tsk,
}
}
+static inline void syscall_set_return_value(struct task_struct *task,
+ struct pt_regs *regs,
+ int error, long val)
+{
+ regs->gr[28] = error ? error : val;
+}
+
+static inline void syscall_rollback(struct task_struct *task,
+ struct pt_regs *regs)
+{
+ /* do nothing */
+}
+
static inline int syscall_get_arch(void)
{
int arch = AUDIT_ARCH_PARISC;