diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-04 09:12:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-04 09:12:50 +0200 |
| commit | f68d891d85c8f9ab1af663ed3ceac18ad58dbabe (patch) | |
| tree | d92db7af512307ab5282eb62f3dd1741ac71d21f /arch/xtensa/include/asm/syscall.h | |
| parent | 5780b627e24113323427c102175296ae43dfb9d7 (diff) | |
| parent | 3fd877d32cac31292628fb8f443543fc1989b49b (diff) | |
| download | op-kernel-dev-f68d891d85c8f9ab1af663ed3ceac18ad58dbabe.zip op-kernel-dev-f68d891d85c8f9ab1af663ed3ceac18ad58dbabe.tar.gz | |
Merge branch 'topic/hda-beep' into topic/hda
Diffstat (limited to 'arch/xtensa/include/asm/syscall.h')
| -rw-r--r-- | arch/xtensa/include/asm/syscall.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/include/asm/syscall.h b/arch/xtensa/include/asm/syscall.h index 0b9f2e1..c1dacca 100644 --- a/arch/xtensa/include/asm/syscall.h +++ b/arch/xtensa/include/asm/syscall.h @@ -31,5 +31,5 @@ asmlinkage long sys_pselect6(int n, fd_set __user *inp, fd_set __user *outp, asmlinkage long sys_ppoll(struct pollfd __user *ufds, unsigned int nfds, struct timespec __user *tsp, const sigset_t __user *sigmask, size_t sigsetsize); - - +asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, + size_t sigsetsize); |
