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

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.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 261e224d

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/android/Kconfig

+0 −9
Original line number Diff line number Diff line 
# 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

kernel/configs/android-base.config

+0 −1
Original line number Diff line number Diff line
@@ -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

kernel/rcu/Kconfig.debug

+1 −2
Original line number Diff line number Diff line
@@ -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.

tools/testing/selftests/filesystems/binderfs/config

+0 −1
Original line number Diff line number Diff line 
CONFIG_ANDROID=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_ANDROID_BINDER_IPC=y