diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-01-23 17:38:12 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-01-23 17:38:12 +0400 |
| commit | 8c9cca9c364bb65a96261ab3a1847f553d20bc25 (patch) | |
| tree | 96bd750b8a35f433c6b3c0dea1548bc539c3c0be | |
| parent | f763dcfc400acdd47e2542122b99af1bd26edcb6 (diff) | |
| parent | fca1555ddc78a7801fde9e2d32ed86977287698b (diff) | |
| download | linux-topics-8c9cca9c364bb65a96261ab3a1847f553d20bc25.tar.gz | |
Merge branch 'tracking-armdroid-ashmem' into merge-linux-linaro
| -rw-r--r-- | drivers/staging/android/ashmem.c | 20 | ||||
| -rw-r--r-- | drivers/staging/android/ashmem.h | 6 |
2 files changed, 25 insertions, 1 deletions
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 19ecf864c6d..64967e2b43e 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -692,6 +692,22 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return ret; } +/* support for 32bit syscalls on 64bit systems */ +#ifdef CONFIG_COMPAT +static long compat_ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + switch (cmd) { + case COMPAT_ASHMEM_SET_SIZE: + cmd = ASHMEM_SET_SIZE; + break; + case COMPAT_ASHMEM_SET_PROT_MASK: + cmd = ASHMEM_SET_PROT_MASK; + break; + } + return ashmem_ioctl(file, cmd, arg); +} +#endif /* CONFIG_COMPAT */ + static const struct file_operations ashmem_fops = { .owner = THIS_MODULE, .open = ashmem_open, @@ -700,7 +716,9 @@ static const struct file_operations ashmem_fops = { .llseek = ashmem_llseek, .mmap = ashmem_mmap, .unlocked_ioctl = ashmem_ioctl, - .compat_ioctl = ashmem_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = compat_ashmem_ioctl, +#endif }; static struct miscdevice ashmem_misc = { diff --git a/drivers/staging/android/ashmem.h b/drivers/staging/android/ashmem.h index 4ecdc731d2f..0ca56c0a927 100644 --- a/drivers/staging/android/ashmem.h +++ b/drivers/staging/android/ashmem.h @@ -47,4 +47,10 @@ struct ashmem_pin { #define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9) #define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10) +/* support for 32bit syscalls on 64bit systems */ +#ifdef CONFIG_COMPAT +#define COMPAT_ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, compat_size_t) +#define COMPAT_ASHMEM_SET_PROT_MASK _IOW(__ASHMEMIOC, 5, unsigned int) +#endif + #endif /* _LINUX_ASHMEM_H */ |