diff options
| author | Will Deacon <will.deacon@arm.com> | 2012-07-30 14:42:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 17:25:20 -0700 |
| commit | 079a96ae3871f0ed9083aac2218136ccec5b9877 (patch) | |
| tree | 52acdeda67006d3d85eee0a17d6241657ba270dc /ipc/syscall.c | |
| parent | 63dca8d5b5ef7effb58b8d6892a024125c0fab0b (diff) | |
| download | linux-stable-079a96ae3871f0ed9083aac2218136ccec5b9877.tar.gz linux-stable-079a96ae3871f0ed9083aac2218136ccec5b9877.tar.bz2 linux-stable-079a96ae3871f0ed9083aac2218136ccec5b9877.zip | |
ipc: add COMPAT_SHMLBA support
If the SHMLBA definition for a native task differs from the definition for
a compat task, the do_shmat() function would need to handle both.
This patch introduces COMPAT_SHMLBA, which is used by the compat shmat
syscall when calling the ipc code and allows architectures such as AArch64
(where the native SHMLBA is 64k but the compat (AArch32) definition is
16k) to provide the correct semantics for compat IPC system calls.
Cc: David S. Miller <davem@davemloft.net>
Cc: Chris Zankel <chris@zankel.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/syscall.c')
| -rw-r--r-- | ipc/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/syscall.c b/ipc/syscall.c index 1d6f53f6b562..0d1e32ce048e 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c @@ -73,7 +73,7 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second, default: { unsigned long raddr; ret = do_shmat(first, (char __user *)ptr, - second, &raddr); + second, &raddr, SHMLBA); if (ret) return ret; return put_user(raddr, (unsigned long __user *) third); |