diff options
| author | Serban Constantinescu <serban.constantinescu@arm.com> | 2013-07-04 10:54:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 14:37:21 -0700 |
| commit | fc56f2ecf091d774c18ad0d470c62c6818fa32a3 (patch) | |
| tree | ab858db8036d7ef8112e65349e08c66dd567814e /drivers/staging/android/binder.h | |
| parent | a9350fc859ae3f1db7f2efd55c7a3e0d09a4098d (diff) | |
| download | op-kernel-dev-fc56f2ecf091d774c18ad0d470c62c6818fa32a3.zip op-kernel-dev-fc56f2ecf091d774c18ad0d470c62c6818fa32a3.tar.gz | |
staging: android: binder: fix BC_FREE_BUFFER ioctl declaration
BinderDriverCommands mirror the ioctl usage. Thus the size of the
structure passed through the interface should be used to generate the
ioctl No.
The change reflects the type being passed from the user space-a pointer
to a binder_buffer. This change should not affect the existing 32bit
user space since BC_FREE_BUFFER is computed as:
#define _IOW(type,nr,size) \
((type) << _IOC_TYPESHIFT) | \
((nr) << _IOC_NRSHIFT) | \
((size) << _IOC_SIZESHIFT))
and for a 32bit compiler BC_FREE_BUFFER will have the same computed
value. This change will also ease our work in differentiating
BC_FREE_BUFFER from COMPAT_BC_FREE_BUFFER.
The change does not affect existing 32bit ABI.
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Acked-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/binder.h')
| -rw-r--r-- | drivers/staging/android/binder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/binder.h b/drivers/staging/android/binder.h index 6515dd2..b55bba9 100644 --- a/drivers/staging/android/binder.h +++ b/drivers/staging/android/binder.h @@ -265,7 +265,7 @@ enum binder_driver_command_protocol { * Else you have acquired a primary reference on the object. */ - BC_FREE_BUFFER = _IOW('c', 3, int), + BC_FREE_BUFFER = _IOW('c', 3, void *), /* * void *: ptr to transaction data received on a read */ |
