diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-02 09:41:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-02 09:41:55 -0700 |
| commit | 10fb048406dccbe9f9de05468ba5e71efa6e9932 (patch) | |
| tree | 4b7c4f39e707259015c52d24eb7b4bae509a476f /kernel | |
| parent | c57cd56b40fdb2ef055938600785896e0bf6caf5 (diff) | |
| parent | 964918f108a9b0f73e444b99f1447d15491c8075 (diff) | |
| download | history-10fb048406dccbe9f9de05468ba5e71efa6e9932.tar.gz | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index 2406b62b1400b1..540574ce88b571 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -399,8 +399,8 @@ asmlinkage long compat_sys_sched_setaffinity(compat_pid_t pid, return ret; } -asmlinkage int compat_sys_sched_getaffinity(compat_pid_t pid, unsigned int len, - compat_ulong_t __user *user_mask_ptr) +asmlinkage long compat_sys_sched_getaffinity(compat_pid_t pid, unsigned int len, + compat_ulong_t __user *user_mask_ptr) { unsigned long kernel_mask; mm_segment_t old_fs; |