remove CONFIG_ANDROID

The ANDROID config symbol is only used to guard the binder config
symbol and to inject completely random config changes.  Remove it
as it is obviously a bad idea.

Acked-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220629150102.1582425-2-hch@lst.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/Makefile b/drivers/Makefile
index 9a30842b22c5411bf00245761f472da9c13370b7..123dce28675834ed42f1e170d3dbc504df88a6a8 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -176,7 +176,7 @@ obj-$(CONFIG_USB4)          += thunderbolt/
 obj-$(CONFIG_CORESIGHT)                += hwtracing/coresight/
 obj-y                          += hwtracing/intel_th/
 obj-$(CONFIG_STM)              += hwtracing/stm/
-obj-$(CONFIG_ANDROID)          += android/
+obj-y                          += android/
 obj-$(CONFIG_NVMEM)            += nvmem/
 obj-$(CONFIG_FPGA)             += fpga/
 obj-$(CONFIG_FSI)              += fsi/

diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index 53b22e26266c3ea2eca4be14447b97d89de46c21..07aa8ae0a058c50807640d046a0fe3af391cbc13 100644 (file)
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -1,13 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 menu "Android"
 
-config ANDROID
-       bool "Android Drivers"
-       help
-         Enable support for various drivers needed on the Android platform
-
-if ANDROID
-
 config ANDROID_BINDER_IPC
        bool "Android Binder IPC Driver"
        depends on MMU
@@ -54,6 +47,4 @@ config ANDROID_BINDER_IPC_SELFTEST
          exhaustively with combinations of various buffer sizes and
          alignments.
 
-endif # if ANDROID
-
 endmenu

diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index eb701b2ac72ffef8573781f4c77ae7e4f9cea938..44b0f0146a3fc68936d5e7916f440883a227c584 100644 (file)
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -7,7 +7,6 @@
 # CONFIG_OABI_COMPAT is not set
 # CONFIG_SYSVIPC is not set
 # CONFIG_USELIB is not set
-CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y

diff --git a/kernel/rcu/Kconfig.debug b/kernel/rcu/Kconfig.debug
index 9b64e55d4f6159f44eac3017ded4b6c67a1803a1..e875f4f889656cfe9e3d792a3e79a2925a9c9e02 100644 (file)
--- a/kernel/rcu/Kconfig.debug
+++ b/kernel/rcu/Kconfig.debug
@@ -86,8 +86,7 @@ config RCU_EXP_CPU_STALL_TIMEOUT
        int "Expedited RCU CPU stall timeout in milliseconds"
        depends on RCU_STALL_COMMON
        range 0 21000
-       default 20 if ANDROID
-       default 0 if !ANDROID
+       default 0
        help
          If a given expedited RCU grace period extends more than the
          specified number of milliseconds, a CPU stall warning is printed.

diff --git a/tools/testing/selftests/filesystems/binderfs/config b/tools/testing/selftests/filesystems/binderfs/config
index 02dd6cc9cf9923a0e9a077258ce6b99cbe7e96c9..7b4fc6ee62057da84fedd3f413b578d300b34948 100644 (file)
--- a/tools/testing/selftests/filesystems/binderfs/config
+++ b/tools/testing/selftests/filesystems/binderfs/config
@@ -1,3 +1,2 @@
-CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDERFS=y
 CONFIG_ANDROID_BINDER_IPC=y

diff --git a/tools/testing/selftests/sync/config b/tools/testing/selftests/sync/config
index 47ff5afc372710e83d1074b65c36a67dd44dde71..64c60f38b446440aa3bb995fef6ad5c73c94732c 100644 (file)
--- a/tools/testing/selftests/sync/config
+++ b/tools/testing/selftests/sync/config
@@ -1,3 +1,2 @@
 CONFIG_STAGING=y
-CONFIG_ANDROID=y
 CONFIG_SW_SYNC=y