Commit 1045a067 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman

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: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220629150102.1582425-2-hch@lst.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 261e224d
...@@ -176,7 +176,7 @@ obj-$(CONFIG_USB4) += thunderbolt/ ...@@ -176,7 +176,7 @@ obj-$(CONFIG_USB4) += thunderbolt/
obj-$(CONFIG_CORESIGHT) += hwtracing/coresight/ obj-$(CONFIG_CORESIGHT) += hwtracing/coresight/
obj-y += hwtracing/intel_th/ obj-y += hwtracing/intel_th/
obj-$(CONFIG_STM) += hwtracing/stm/ obj-$(CONFIG_STM) += hwtracing/stm/
obj-$(CONFIG_ANDROID) += android/ obj-y += android/
obj-$(CONFIG_NVMEM) += nvmem/ obj-$(CONFIG_NVMEM) += nvmem/
obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FPGA) += fpga/
obj-$(CONFIG_FSI) += fsi/ obj-$(CONFIG_FSI) += fsi/
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
menu "Android" menu "Android"
config ANDROID
bool "Android Drivers"
help
Enable support for various drivers needed on the Android platform
if ANDROID
config ANDROID_BINDER_IPC config ANDROID_BINDER_IPC
bool "Android Binder IPC Driver" bool "Android Binder IPC Driver"
depends on MMU depends on MMU
...@@ -54,6 +47,4 @@ config ANDROID_BINDER_IPC_SELFTEST ...@@ -54,6 +47,4 @@ config ANDROID_BINDER_IPC_SELFTEST
exhaustively with combinations of various buffer sizes and exhaustively with combinations of various buffer sizes and
alignments. alignments.
endif # if ANDROID
endmenu endmenu
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
# CONFIG_OABI_COMPAT is not set # CONFIG_OABI_COMPAT is not set
# CONFIG_SYSVIPC is not set # CONFIG_SYSVIPC is not set
# CONFIG_USELIB is not set # CONFIG_USELIB is not set
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y
......
...@@ -86,8 +86,7 @@ config RCU_EXP_CPU_STALL_TIMEOUT ...@@ -86,8 +86,7 @@ config RCU_EXP_CPU_STALL_TIMEOUT
int "Expedited RCU CPU stall timeout in milliseconds" int "Expedited RCU CPU stall timeout in milliseconds"
depends on RCU_STALL_COMMON depends on RCU_STALL_COMMON
range 0 21000 range 0 21000
default 20 if ANDROID default 0
default 0 if !ANDROID
help help
If a given expedited RCU grace period extends more than the If a given expedited RCU grace period extends more than the
specified number of milliseconds, a CPU stall warning is printed. specified number of milliseconds, a CPU stall warning is printed.
......
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDERFS=y CONFIG_ANDROID_BINDERFS=y
CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_IPC=y
CONFIG_STAGING=y CONFIG_STAGING=y
CONFIG_ANDROID=y
CONFIG_SW_SYNC=y CONFIG_SW_SYNC=y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment