diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-01-24 20:13:29 +0100 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-01-24 20:13:29 +0100 |
| commit | 358613ae1ce2358f0191f8480300188e42d8ae75 (patch) | |
| tree | 3bef053da2071d21ee4da06f6688ff7d52fa5a03 | |
| parent | 8c9cca9c364bb65a96261ab3a1847f553d20bc25 (diff) | |
| download | linux-topics-358613ae1ce2358f0191f8480300188e42d8ae75.tar.gz | |
Revert "staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel"
This reverts commit fca1555ddc78a7801fde9e2d32ed86977287698b.
| -rw-r--r-- | drivers/staging/android/ashmem.c | 20 | ||||
| -rw-r--r-- | drivers/staging/android/ashmem.h | 6 |
2 files changed, 1 insertions, 25 deletions
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 64967e2b43e..19ecf864c6d 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -692,22 +692,6 @@ 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, @@ -716,9 +700,7 @@ static const struct file_operations ashmem_fops = { .llseek = ashmem_llseek, .mmap = ashmem_mmap, .unlocked_ioctl = ashmem_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = compat_ashmem_ioctl, -#endif + .compat_ioctl = ashmem_ioctl, }; static struct miscdevice ashmem_misc = { diff --git a/drivers/staging/android/ashmem.h b/drivers/staging/android/ashmem.h index 0ca56c0a927..4ecdc731d2f 100644 --- a/drivers/staging/android/ashmem.h +++ b/drivers/staging/android/ashmem.h @@ -47,10 +47,4 @@ 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 */ |