Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / arch / s390 / include / asm / syscall.h

diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index b239ff5..2be14b2 100644 (file)
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -62,6 +62,12 @@ static inline void syscall_get_arguments(struct task_struct *task,
 {
        unsigned long mask = -1UL;
 
+       /*
+        * No arguments for this syscall, there's nothing to do.
+        */
+       if (!n)
+               return;
+
        BUG_ON(i + n > 6);
 #ifdef CONFIG_COMPAT
        if (test_tsk_thread_flag(task, TIF_31BIT))