diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-09-17 09:46:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-09-17 10:23:50 +0100 |
| commit | 315860c4f912990c75ef228775ea8871fc5bcc9a (patch) | |
| tree | b80d9258a211000be232ea424b51747792309a72 /drivers | |
| parent | fd2bc059ed466bdd95347a4f7891d150d94e7de2 (diff) | |
| download | linux-next-315860c4f912990c75ef228775ea8871fc5bcc9a.tar.gz linux-next-315860c4f912990c75ef228775ea8871fc5bcc9a.zip | |
binder: Fix up Kconfig dependancy due to removal of .c code
When the .c binder code was removed, building the kernel if the rust
binder code was enabled, will cause the binder to not be built at all as
the option changed from .c to .rs which is probably not what the
original build wanted.
Fix this up by renaming the option back to the _RUST version. If in the
future, that suffix wants to be dropped, we can do so and then it will
be prompted for a choice again, but for this release cycle, it should
stay as-is.
Tested-by: Carlos Llamas <cmllamas@google.com>
Link: https://patch.msgid.link/2026091743-pony-prewar-735b@gregkh
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/android/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/android/Makefile | 2 | ||||
| -rw-r--r-- | drivers/android/binder/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig index 403e5f3eab5a..c920d52c0221 100644 --- a/drivers/android/Kconfig +++ b/drivers/android/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 menu "Android" -config ANDROID_BINDER_IPC +config ANDROID_BINDER_IPC_RUST bool "Android Binder IPC Driver" depends on MMU depends on NET @@ -17,7 +17,7 @@ config ANDROID_BINDER_IPC config ANDROID_BINDER_DEVICES string "Android Binder devices" - depends on ANDROID_BINDER_IPC + depends on ANDROID_BINDER_IPC_RUST default "binder,hwbinder,vndbinder" help Default value for the binder.devices parameter. diff --git a/drivers/android/Makefile b/drivers/android/Makefile index dc19d21037af..f83d39d16f6e 100644 --- a/drivers/android/Makefile +++ b/drivers/android/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only ccflags-y += -I$(src) # needed for trace events -obj-$(CONFIG_ANDROID_BINDER_IPC) += binder/ +obj-$(CONFIG_ANDROID_BINDER_IPC_RUST) += binder/ diff --git a/drivers/android/binder/Makefile b/drivers/android/binder/Makefile index 661f5cca8918..fe474628a94e 100644 --- a/drivers/android/binder/Makefile +++ b/drivers/android/binder/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only ccflags-y += -I$(src) # needed for trace events -obj-$(CONFIG_ANDROID_BINDER_IPC) += binder.o +obj-$(CONFIG_ANDROID_BINDER_IPC_RUST) += binder.o binder-y := \ rust_binder_main.o \ rust_binderfs.o \ |