diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/parisc/kernel/syscall_table.S | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
| -rw-r--r-- | arch/parisc/kernel/syscall_table.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 843f423dec6..01c4fcf8f48 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S | |||
| @@ -234,7 +234,7 @@ | |||
| 234 | ENTRY_SAME(getsid) | 234 | ENTRY_SAME(getsid) |
| 235 | ENTRY_SAME(fdatasync) | 235 | ENTRY_SAME(fdatasync) |
| 236 | /* struct __sysctl_args is a mess */ | 236 | /* struct __sysctl_args is a mess */ |
| 237 | ENTRY_DIFF(sysctl) | 237 | ENTRY_COMP(sysctl) |
| 238 | ENTRY_SAME(mlock) /* 150 */ | 238 | ENTRY_SAME(mlock) /* 150 */ |
| 239 | ENTRY_SAME(munlock) | 239 | ENTRY_SAME(munlock) |
| 240 | ENTRY_SAME(mlockall) | 240 | ENTRY_SAME(mlockall) |