diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:24:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 15:24:46 -0400 |
| commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
| tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /arch/um/sys-i386/syscalls.c | |
| parent | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
| download | linux-rt-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.tar.gz | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/um/sys-i386/syscalls.c')
| -rw-r--r-- | arch/um/sys-i386/syscalls.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c index 749dd1bfe60f..710d5fb807e1 100644 --- a/arch/um/sys-i386/syscalls.c +++ b/arch/um/sys-i386/syscalls.c @@ -99,11 +99,12 @@ long sys_ipc (uint call, int first, int second, switch (call) { case SEMOP: - return sys_semtimedop(first, (struct sembuf *) ptr, second, - NULL); + return sys_semtimedop(first, (struct sembuf __user *) ptr, + second, NULL); case SEMTIMEDOP: - return sys_semtimedop(first, (struct sembuf *) ptr, second, - (const struct timespec *) fifth); + return sys_semtimedop(first, (struct sembuf __user *) ptr, + second, + (const struct timespec __user *) fifth); case SEMGET: return sys_semget (first, second, third); case SEMCTL: { |