diff options
| author | Laura Abbott <labbott@redhat.com> | 2017-04-18 11:27:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 20:43:14 +0200 |
| commit | b0c7cb2623ede9823850945ba1e9eb442fd668a7 (patch) | |
| tree | bd9cb1a4ec765f0cc1778082f4a961ddebf8c6d9 /drivers/staging/android/ion/ion.c | |
| parent | 62b3a094cb9e4a3c5a5be4a20b72e0ced3af0e31 (diff) | |
staging: android: ion: Break the ABI in the name of forward progress
Several of the Ion ioctls were designed in such a way that they
necessitate compat ioctls. We're breaking a bunch of other ABIs and
cleaning stuff up anyway so let's follow the ioctl guidelines and clean
things up while everyone is busy converting things over anyway. As part
of this, also remove the useless alignment field from the allocation
structure.
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/ion/ion.c')
| -rw-r--r-- | drivers/staging/android/ion/ion.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 65638f509f6c..fbab1e37c8bf 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -40,7 +40,6 @@ #include "ion.h" #include "ion_priv.h" -#include "compat_ion.h" bool ion_buffer_cached(struct ion_buffer *buffer) { @@ -1065,7 +1064,9 @@ static const struct file_operations ion_fops = { .open = ion_open, .release = ion_release, .unlocked_ioctl = ion_ioctl, - .compat_ioctl = compat_ion_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = ion_ioctl, +#endif }; static size_t ion_debug_heap_total(struct ion_client *client, |