diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /include/linux/syscalls.h | |
| parent | 482e6f8466ab1066f1a969bcdbe916b56439622c (diff) | |
| parent | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/linux/syscalls.h')
| -rw-r--r-- | include/linux/syscalls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 4a19d9bb8368..1e3cd5fec7ed 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -289,7 +289,7 @@ asmlinkage long sys_capget(cap_user_header_t header, | |||
| 289 | cap_user_data_t dataptr); | 289 | cap_user_data_t dataptr); |
| 290 | asmlinkage long sys_capset(cap_user_header_t header, | 290 | asmlinkage long sys_capset(cap_user_header_t header, |
| 291 | const cap_user_data_t data); | 291 | const cap_user_data_t data); |
| 292 | asmlinkage long sys_personality(u_long personality); | 292 | asmlinkage long sys_personality(unsigned int personality); |
| 293 | 293 | ||
| 294 | asmlinkage long sys_sigpending(old_sigset_t __user *set); | 294 | asmlinkage long sys_sigpending(old_sigset_t __user *set); |
| 295 | asmlinkage long sys_sigprocmask(int how, old_sigset_t __user *set, | 295 | asmlinkage long sys_sigprocmask(int how, old_sigset_t __user *set, |