diff options
| author | Arve Hjønnevåg <arve@android.com> | 2014-01-30 14:49:43 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-07 14:15:02 +0200 |
| commit | 4fa771e0159491dd1b0bc0ab0a30fa50270518c7 (patch) | |
| tree | 58170b90716c23a49c0b39178cd19f7e3e7effd5 | |
| parent | 69f203714153d7d9ae8c84ed3fbf27e93ab4647f (diff) | |
Staging: android: binder: Remove support for old 32 bit binder protocol.
Change-Id: I371072175a298282254a21ea69503b9d75633dc5
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Mister Oyster <oysterized@gmail.com>
| -rw-r--r-- | drivers/android/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/android/binder.c | 4 | ||||
| -rw-r--r-- | include/uapi/linux/android/binder.h | 9 |
3 files changed, 0 insertions, 26 deletions
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig index bdfc6c6f4..4f6629d33 100644 --- a/drivers/android/Kconfig +++ b/drivers/android/Kconfig @@ -19,19 +19,6 @@ config ANDROID_BINDER_IPC Android process, using Binder to identify, invoke and pass arguments between said processes. -config ANDROID_BINDER_IPC_32BIT - bool - depends on !64BIT && ANDROID_BINDER_IPC - default y - ---help--- - The Binder API has been changed to support both 32 and 64bit - applications in a mixed environment. - - Enable this to support an old 32-bit Android user-space (v4.4 and - earlier). - - Note that enabling this will break newer Android user-space. - endif # if ANDROID endmenu diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 5fc0ab122..4c045c9e4 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -45,10 +45,6 @@ #include <linux/rtc.h> #include <linux/aee.h> -#ifdef CONFIG_ANDROID_BINDER_IPC_32BIT -#define BINDER_IPC_32BIT 1 -#endif - #ifdef CONFIG_MT_PRIO_TRACER #include <linux/prio_tracer.h> #endif diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h index c653800b3..69cbd99fa 100644 --- a/include/uapi/linux/android/binder.h +++ b/include/uapi/linux/android/binder.h @@ -39,13 +39,8 @@ enum { FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100, }; -#ifdef BINDER_IPC_32BIT -typedef __u32 binder_size_t; -typedef __u32 binder_uintptr_t; -#else typedef __u64 binder_size_t; typedef __u64 binder_uintptr_t; -#endif /* * This is the flattened representation of a Binder object for transfer @@ -90,11 +85,7 @@ struct binder_version { }; /* This is the current protocol version. */ -#ifdef BINDER_IPC_32BIT -#define BINDER_CURRENT_PROTOCOL_VERSION 7 -#else #define BINDER_CURRENT_PROTOCOL_VERSION 8 -#endif #define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read) #define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, __s64) |