diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 48873ed90b7c..174a63cb3c56 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -589,6 +589,7 @@ CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
+CONFIG_ASHMEM=y
 CONFIG_ASHMEM_RUST=y
 CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_SUNXI_CCU is not set
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index ef6dc675b11b..79920144a5db 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -537,6 +537,7 @@ CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_BALLOON=m
 CONFIG_VHOST_VSOCK=y
 CONFIG_STAGING=y
+CONFIG_ASHMEM=y
 CONFIG_ASHMEM_RUST=y
 CONFIG_REMOTEPROC=y
 CONFIG_REMOTEPROC_CDEV=y
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 19d8416e484e..9bfef6599e6d 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -17,15 +17,10 @@ config ASHMEM
 	  because it can discard shared memory units when under memory pressure.
 
 config ASHMEM_RUST
-	bool "Enable the Anonymous Shared Memory Subsystem in Rust"
-	depends on SHMEM && RUST && !ASHMEM
-	select ANDROID_STAGING
-	help
-	  The ashmem subsystem is a new shared memory allocator, similar to
-	  POSIX SHM but with different behavior and sporting a simpler
-	  file-based API.
+	bool "Use the Rust implementation of Ashmem"
+	depends on ASHMEM && RUST
 
-	  It is, in theory, a good memory allocator for low-memory devices,
-	  because it can discard shared memory units when under memory pressure.
+config ASHMEM_C
+	def_bool ASHMEM && !ASHMEM_RUST
 
 endmenu
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index 39121ac44581..55a4320bbf8e 100644
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
 ccflags-y += -I$(src)			# needed for trace events
 
-obj-$(CONFIG_ASHMEM)			+= ashmem.o
+obj-$(CONFIG_ASHMEM_C)			+= ashmem.o
 obj-$(CONFIG_ASHMEM_RUST)		+= ashmem_rust.o