diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-12-19 15:56:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-19 16:10:25 -0800 |
| commit | 07300f43d63d31294ee22b0d53091a8aec4cbc2d (patch) | |
| tree | ad4ebdd451de9f128d10eadf51d872b62710227d | |
| parent | 364014fda831917f37212715c72bf6db71a63a6d (diff) | |
| download | linux-07300f43d63d31294ee22b0d53091a8aec4cbc2d.tar.gz linux-07300f43d63d31294ee22b0d53091a8aec4cbc2d.tar.bz2 linux-07300f43d63d31294ee22b0d53091a8aec4cbc2d.zip | |
ion_test: Add compat_ioctl support (v2)
Prior to subitting this, Colin reworked the compat_ioctl support
for the ion_test driver, moving the structure to be the same size
on both 32 and 64 bit architectures.
Two small things were left out. The compat_ioctl ptr assignment,
and the fact that despite having uniform sized types in the
structure, the structure pads out to different sizes on different
arches.
This patch resolves this issue by adding a padding entry after
the write flag, and adding the compat_ioctl ptr.
Changes in v2:
- Add a padding int rather then making write a u64
Acked-by: Colin Cross <ccross@android.com>
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/android/ion/ion_test.c | 1 | ||||
| -rw-r--r-- | drivers/staging/android/uapi/ion_test.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/android/ion/ion_test.c b/drivers/staging/android/ion/ion_test.c index 3e20349baf7c..654acb5c8eba 100644 --- a/drivers/staging/android/ion/ion_test.c +++ b/drivers/staging/android/ion/ion_test.c @@ -231,6 +231,7 @@ static int ion_test_release(struct inode *inode, struct file *file) static const struct file_operations ion_test_fops = { .owner = THIS_MODULE, .unlocked_ioctl = ion_test_ioctl, + .compat_ioctl = ion_test_ioctl, .open = ion_test_open, .release = ion_test_release, }; diff --git a/drivers/staging/android/uapi/ion_test.h b/drivers/staging/android/uapi/ion_test.h index 614d1e36f72c..ffef06f63133 100644 --- a/drivers/staging/android/uapi/ion_test.h +++ b/drivers/staging/android/uapi/ion_test.h @@ -32,6 +32,7 @@ struct ion_test_rw_data { __u64 offset; __u64 size; int write; + int __padding; }; #define ION_IOC_MAGIC 'I' |