From: John Stultz <john.stultz@linaro.org>
Date: Mon, 3 Mar 2014 09:35:23 +0000 (-0800)
Subject: staging: Fix build issues with new binder API
X-Git-Tag: firefly_0821_release~3680^2~4^2~31^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4a7ff82758858f77328574519f144e554513e6ba;p=firefly-linux-kernel-4.4.55.git

staging: Fix build issues with new binder API

The new 64bit binder API causes build issues on 32bit ARM
due to the lack of 64bit __get_user_asm_* implementation.

Until that implementation is done, remove the choice for
32bit ARM, automatically enabling the old 32bit binder
protocol.

This can be reverted once a 64bit __get_user_asm_*
implementation is merged.

Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Colin Cross <ccross@android.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Serban Constantinescu <serban.constantinescu@arm.com>
Cc: Android Kernel Team <kernel-team@android.com>
Reported-by: Arnd Bergmann <arnd.bergmann@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index a802bc0bf4a4..1e1b36ab1389 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -20,9 +20,9 @@ config ANDROID_BINDER_IPC
 	  between said processes.
 
 config ANDROID_BINDER_IPC_32BIT
-	bool "Use old 32-bit binder api"
+	bool
         default y
-	depends on !64BIT
+	depends on !64BIT && ANDROID_BINDER_IPC
 	---help---
 	  Enable to support an old 32-bit Android user-space. Breaks the new
 	  Android user-space.