diff options
| author | Ramji Jiyani <ramjiyani@google.com> | 2024-05-01 21:17:26 +0000 |
|---|---|---|
| committer | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-02 07:40:32 +0000 |
| commit | 0a532ff518e1d119712a4475d69c09d80d39cf54 (patch) | |
| tree | bc1950bf10ceb878cd001a59c88cc326bca5a370 | |
| parent | b9977e007974dd85a1687ddaa82b7e6a2b350b2b (diff) | |
| download | gs-0a532ff518e1d119712a4475d69c09d80d39cf54.tar.gz | |
ANDROID: GKI: Convert CONFIG_NET_9P as GKI modules
CONFIG_NET_9P: Plan 9 resource sharing via the 9P2000 protocol.
It is being used by ARCVM for file sharing between guest and host.
Removes CONFIG_UNIX=y & CONFIG_INET=y from gki_defconfig by
savedefconfig as these boolean configs are implied to set
when CONFIG_NET_9P=m.
Note: These drivers need kernel_read() and kernel_write() to
be accessed which are not allowed on KMI symbol list; so these
drivers can not be vendor or unprotected GKI modules.
Bug: 332937984
Test: TH
Change-Id: Ie5374659f70cd73706ae874f81c215ee991dadbd
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
| -rw-r--r-- | arch/arm64/configs/gki_defconfig | 3 | ||||
| -rw-r--r-- | arch/x86/configs/gki_defconfig | 3 | ||||
| -rw-r--r-- | modules.bzl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 829640f25707..9aaabbe1e002 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -119,14 +119,12 @@ CONFIG_LRU_GEN=y CONFIG_LRU_GEN_ENABLED=y CONFIG_NET=y CONFIG_PACKET=y -CONFIG_UNIX=y CONFIG_XFRM_USER=y CONFIG_XFRM_INTERFACE=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y CONFIG_NET_KEY=y CONFIG_XDP_SOCKETS=y -CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y @@ -276,6 +274,7 @@ CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y CONFIG_RFKILL=m +CONFIG_NET_9P=m CONFIG_NFC=m CONFIG_PCI=y CONFIG_PCIEPORTBUS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index f896991b2a4a..2c24d0e2a993 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -116,14 +116,12 @@ CONFIG_LRU_GEN=y CONFIG_LRU_GEN_ENABLED=y CONFIG_NET=y CONFIG_PACKET=y -CONFIG_UNIX=y CONFIG_XFRM_USER=y CONFIG_XFRM_INTERFACE=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y CONFIG_NET_KEY=y CONFIG_XDP_SOCKETS=y -CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTIPLE_TABLES=y @@ -273,6 +271,7 @@ CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y CONFIG_RFKILL=m +CONFIG_NET_9P=m CONFIG_NFC=m CONFIG_PCI=y CONFIG_PCIEPORTBUS=y diff --git a/modules.bzl b/modules.bzl index 87989e775abd..a7a64af5b49a 100644 --- a/modules.bzl +++ b/modules.bzl @@ -53,6 +53,8 @@ _COMMON_GKI_MODULES_LIST = [ "net/6lowpan/nhc_routing.ko", "net/6lowpan/nhc_udp.ko", "net/8021q/8021q.ko", + "net/9p/9pnet.ko", + "net/9p/9pnet_fd.ko", "net/bluetooth/bluetooth.ko", "net/bluetooth/hidp/hidp.ko", "net/bluetooth/rfcomm/rfcomm.ko", |