On Wed, Jun 29, 2022 at 05:01:02PM +0200, Christoph Hellwig wrote:
> 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.
>
> Signed-off-by: Christoph Hellwig <h...@lst.de>
And I got confirmation from the Android folks that they have other ways
of getting their 20-millisecond expedited RCU CPU stall warnings, so:
Acked-by: Paul E. McKenney <paul...@kernel.org>
> ---
> drivers/Makefile | 2 +-
> drivers/android/Kconfig | 9 ---------
> drivers/char/random.c | 3 +--
> drivers/net/wireguard/device.c | 2 +-
> kernel/configs/android-base.config | 1 -
> kernel/rcu/Kconfig.debug | 3 +--
> tools/testing/selftests/filesystems/binderfs/config | 1 -
> tools/testing/selftests/sync/config | 1 -
> 8 files changed, 4 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 9a30842b22c54..123dce2867583 100644
> --- 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 53b22e26266c3..07aa8ae0a058c 100644
> --- 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/drivers/char/random.c b/drivers/char/random.c
> index e3dd1dd3dd226..f35ad1a9dff3e 100644
> --- a/drivers/char/random.c
> +++ b/drivers/char/random.c
> @@ -755,8 +755,7 @@ static int random_pm_notification(struct notifier_block
> *nb, unsigned long actio
> spin_unlock_irqrestore(&input_pool.lock, flags);
>
> if (crng_ready() && (action == PM_RESTORE_PREPARE ||
> - (action == PM_POST_SUSPEND &&
> - !IS_ENABLED(CONFIG_PM_AUTOSLEEP) && !IS_ENABLED(CONFIG_ANDROID))))
> {
> + (action == PM_POST_SUSPEND && !IS_ENABLED(CONFIG_PM_AUTOSLEEP)))) {
> crng_reseed();
> pr_notice("crng reseeded on system resumption\n");
> }
> diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c
> index aa9a7a5970fda..de1cc03f7ee86 100644
> --- a/drivers/net/wireguard/device.c
> +++ b/drivers/net/wireguard/device.c
> @@ -69,7 +69,7 @@ static int wg_pm_notification(struct notifier_block *nb,
> unsigned long action, v
> * its normal operation rather than as a somewhat rare event, then we
> * don't actually want to clear keys.
> */
> - if (IS_ENABLED(CONFIG_PM_AUTOSLEEP) || IS_ENABLED(CONFIG_ANDROID))
> + if (IS_ENABLED(CONFIG_PM_AUTOSLEEP))
> return 0;
>
> if (action != PM_HIBERNATION_PREPARE && action != PM_SUSPEND_PREPARE)
> diff --git a/kernel/configs/android-base.config
> b/kernel/configs/android-base.config
> index eb701b2ac72ff..44b0f0146a3fc 100644
> --- 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 9b64e55d4f615..e875f4f889656 100644
> --- 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 02dd6cc9cf992..7b4fc6ee62057 100644
> --- 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 47ff5afc37271..64c60f38b4464 100644
> --- 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
> --
> 2.30.2
>
