aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-12-19 15:56:23 -0800
committerColin Cross <ccross@android.com>2013-12-19 19:25:39 -0800
commit892e1580141cde0f80180e43f6c8c3dc356ddaf2 (patch)
tree48da0a4e9c34a1c2e17a8945c2237aa8fa19ddcd /drivers/staging
parentc6448537fe9e8b684b214e89c6c68c3b209f549e (diff)
downloadlinaro-lsk-892e1580141cde0f80180e43f6c8c3dc356ddaf2.tar.gz
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 Cc: Colin Cross <ccross@android.com> Cc: Greg KH <gregkh@linuxfoundation.org> Cc: Android Kernel Team <kernel-team@android.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/android/ion/ion_test.c1
-rw-r--r--drivers/staging/android/uapi/ion_test.h1
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 3e20349baf7..654acb5c8eb 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 614d1e36f72..ffef06f6313 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'