ANDROID: GKI: Fix up "do not export symbol_get/put()" commit

When removing the export from symbol_get/put(), I disabled lots of different drivers in the allmodconfig build file. As some pointed out, that's not the nicest thing to do, as we really do want the build coverage, so instead, "tweak" the Kconfig files to make the problamatic modules be built-in to the kernel image. That removes the problem of the export going away and still gives us good build testing coverage, without modifying any real-world device configurations. Note, 3 config options are "turned off" so they can not be selected, as they could not be worked around in any semi-sane manner: VIDEO_CX23885 DELL_LAPTOP SAMPLE_HW_BREAKPOINT none of which affects any known Android devices. Bug: 162613590 Fixes: 882b7ca ("ANDROID: GKI: do not export symbol_get/put()") Signed-off-by: Greg Kroah-Hartman <[email protected]> Change-Id: Ia28f73a64566438940b876a5d9c1a0137c6304d0
AndroidBlobs · Aug 1, 2020 · a35cf72 · a35cf72
1 parent 53b501f
commit a35cf72
Show file tree

Hide file tree

Showing 42 changed files with 90 additions and 119 deletions.
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
@@ -19,7 +19,7 @@ menuconfig VIRTUALIZATION
 if VIRTUALIZATION
 
 config KVM
-	tristate "Kernel-based Virtual Machine (KVM) support"
+	bool "Kernel-based Virtual Machine (KVM) support"
 	depends on HAVE_KVM
 	depends on HIGH_RES_TIMERS
 	# for TASKSTATS/TASK_DELAY_ACCT:

diff --git a/build.config.allmodconfig b/build.config.allmodconfig
@@ -1,44 +1,12 @@
 DEFCONFIG=allmodconfig
 
-# When trying to prevent others from using symbol_get/put we need to exclude a
-# number of in-kernel modules that use those functions.
-SYMBOL_GET_USERS="			\
-	-d CAIF				\
-	-d DELL_LAPTOP			\
-	-d DRM_I915			\
-	-d DVB_USB			\
-	-d DVB_USB_V2			\
-	-d FSL_ENETC			\
-	-d FSL_ENETC_VF			\
-	-d INTEL_IPS			\
-	-d KVM				\
-	-d MEDIA_DIGITAL_TV_SUPPORT	\
-	-d MEDIA_PCI_SUPPORT		\
-	-d MEDIA_RADIO_SUPPORT		\
-	-d MTD_CFI			\
-	-d MTD_GEN_PROBE		\
-	-d MTD_HYPERBUS			\
-	-d MTD_JEDECPROBE		\
-	-d MTD_TS5500			\
-	-d NFS_V4			\
-	-d SAMPLE_HW_BREAKPOINT		\
-	-d VFIO				\
-	-d VIDEO_CX231XX		\
-	-d VIDEO_EM28XX			\
-	-d VIDEO_GO7007			\
-	-d VIDEO_PVRUSB2		\
-	-d VIDEO_TM6000			\
-	-d VIDEO_USBVISION		\
-"
-
 POST_DEFCONFIG_CMDS="update_config"
 function update_config() {
     ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
          -d TEST_KMOD  \
          -d CPU_BIG_ENDIAN \
          -d STM \
          -d TEST_MEMCAT_P \
-         ${SYMBOL_GET_USERS} \
          -e UNWINDER_FRAME_POINTER \
 
     (cd ${OUT_DIR} && \

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 menuconfig AGP
-	tristate "/dev/agpgart (AGP Support)"
+	bool "/dev/agpgart (AGP Support)"
 	depends on ALPHA || IA64 || PARISC || PPC || X86
 	depends on PCI
 	---help---

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
@@ -6,7 +6,7 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 #
 menuconfig DRM
-	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
+	bool "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
 	depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA
 	select DRM_PANEL_ORIENTATION_QUIRKS
 	select HDMI
@@ -55,7 +55,7 @@ config DRM_DEBUG_MM
 	  If in doubt, say "N".
 
 config DRM_DEBUG_SELFTEST
-	tristate "kselftests for DRM"
+	bool "kselftests for DRM"
 	depends on DRM
 	depends on DEBUG_KERNEL
 	select PRIME_NUMBERS

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DRM_I915
-	tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
+	bool "Intel 8xx/9xx/G3x/G4x/HD Graphics"
 	depends on DRM
 	depends on X86 && PCI
 	select INTEL_GTT

diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig
@@ -7,7 +7,7 @@ menu "I2C Algorithms"
 	visible if !I2C_HELPER_AUTO
 
 config I2C_ALGOBIT
-	tristate "I2C bit-banging interfaces"
+	bool "I2C bit-banging interfaces"
 
 config I2C_ALGOPCF
 	tristate "I2C PCF 8584 interfaces"

diff --git a/drivers/media/common/b2c2/Kconfig b/drivers/media/common/b2c2/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_B2C2_FLEXCOP
-	tristate
+	bool
 	depends on DVB_CORE && I2C
 	depends on DVB_B2C2_FLEXCOP_PCI || DVB_B2C2_FLEXCOP_USB
 	default y

diff --git a/drivers/media/pci/bt8xx/Kconfig b/drivers/media/pci/bt8xx/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_BT848
-	tristate "BT848 Video For Linux"
+	bool "BT848 Video For Linux"
 	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2
 	select I2C_ALGOBIT
 	select VIDEOBUF_DMA_SG
@@ -23,7 +23,7 @@ config VIDEO_BT848
 	  module will be called bttv.
 
 config DVB_BT8XX
-	tristate "DVB/ATSC Support for bt878 based TV cards"
+	bool "DVB/ATSC Support for bt878 based TV cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_BT848
 	select DVB_MT352 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_SP887X if MEDIA_SUBDRV_AUTOSELECT

diff --git a/drivers/media/pci/cx18/Kconfig b/drivers/media/pci/cx18/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_CX18
-	tristate "Conexant cx23418 MPEG encoder support"
+	bool "Conexant cx23418 MPEG encoder support"
 	depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C
 	select I2C_ALGOBIT
 	select VIDEOBUF_VMALLOC

diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
@@ -2,6 +2,7 @@
 config VIDEO_CX23885
 	tristate "Conexant cx23885 (2388x successor) support"
 	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT && SND
+	depends on BROKEN
 	select SND_PCM
 	select I2C_ALGOBIT
 	select VIDEO_TUNER

diff --git a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
@@ -31,7 +31,7 @@ config VIDEO_CX88_ALSA
 	  module will be called cx88-alsa.
 
 config VIDEO_CX88_BLACKBIRD
-	tristate "Blackbird MPEG encoder support (cx2388x + cx23416)"
+	bool "Blackbird MPEG encoder support (cx2388x + cx23416)"
 	depends on VIDEO_CX88
 	select VIDEO_CX2341X
 	help
@@ -43,7 +43,7 @@ config VIDEO_CX88_BLACKBIRD
 	  module will be called cx88-blackbird.
 
 config VIDEO_CX88_DVB
-	tristate "DVB/ATSC Support for cx2388x based TV cards"
+	bool "DVB/ATSC Support for cx2388x based TV cards"
 	depends on VIDEO_CX88 && DVB_CORE
 	select VIDEOBUF2_DVB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT

diff --git a/drivers/media/pci/ddbridge/Kconfig b/drivers/media/pci/ddbridge/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_DDBRIDGE
-	tristate "Digital Devices bridge support"
+	bool "Digital Devices bridge support"
 	depends on DVB_CORE && PCI && I2C
 	select DVB_LNBP21 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV6110x if MEDIA_SUBDRV_AUTOSELECT

diff --git a/drivers/media/pci/dm1105/Kconfig b/drivers/media/pci/dm1105/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_DM1105
-	tristate "SDMC DM1105 based PCI cards"
+	bool "SDMC DM1105 based PCI cards"
 	depends on DVB_CORE && PCI && I2C && I2C_ALGOBIT
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT

diff --git a/drivers/media/pci/mantis/Kconfig b/drivers/media/pci/mantis/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config MANTIS_CORE
-	tristate "Mantis/Hopper PCI bridge based devices"
+	bool "Mantis/Hopper PCI bridge based devices"
 	depends on PCI && I2C && INPUT && RC_CORE
 
 	help
@@ -9,7 +9,7 @@ config MANTIS_CORE
 	  Say Y if you own such a device and want to use it.
 
 config DVB_MANTIS
-	tristate "MANTIS based cards"
+	bool "MANTIS based cards"
 	depends on MANTIS_CORE && DVB_CORE && PCI && I2C
 	select DVB_MB86A16 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
@@ -28,7 +28,7 @@ config DVB_MANTIS
 	  If unsure say N.
 
 config DVB_HOPPER
-	tristate "HOPPER based cards"
+	bool "HOPPER based cards"
 	depends on MANTIS_CORE && DVB_CORE && PCI && I2C
 	select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_PLL

diff --git a/drivers/media/pci/netup_unidvb/Kconfig b/drivers/media/pci/netup_unidvb/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_NETUP_UNIDVB
-	tristate "NetUP Universal DVB card support"
+	bool "NetUP Universal DVB card support"
 	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && SPI_MASTER
 	select VIDEOBUF2_DVB
 	select VIDEOBUF2_VMALLOC

diff --git a/drivers/media/pci/ngene/Kconfig b/drivers/media/pci/ngene/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_NGENE
-	tristate "Micronas nGene support"
+	bool "Micronas nGene support"
 	depends on DVB_CORE && PCI && I2C
 	select DVB_LNBP21 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV6110x if MEDIA_SUBDRV_AUTOSELECT

diff --git a/drivers/media/pci/saa7134/Kconfig b/drivers/media/pci/saa7134/Kconfig
@@ -30,13 +30,13 @@ config VIDEO_SAA7134_RC
 	bool "Philips SAA7134 Remote Controller support"
 	depends on RC_CORE
 	depends on VIDEO_SAA7134
-	depends on !(RC_CORE=m && VIDEO_SAA7134=y)
+	#depends on !(RC_CORE=m && VIDEO_SAA7134=y)
 	default y
 	help
 	  Enables Remote Controller support on saa7134 driver.
 
 config VIDEO_SAA7134_DVB
-	tristate "DVB/ATSC Support for saa7134 based TV cards"
+	bool "DVB/ATSC Support for saa7134 based TV cards"
 	depends on VIDEO_SAA7134 && DVB_CORE
 	select VIDEOBUF2_DVB
 	select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT

diff --git a/drivers/media/pci/saa7164/Kconfig b/drivers/media/pci/saa7164/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_SAA7164
-	tristate "NXP SAA7164 support"
+	bool "NXP SAA7164 support"
 	depends on DVB_CORE && VIDEO_DEV && PCI && I2C
 	select I2C_ALGOBIT
 	select FW_LOADER

diff --git a/drivers/media/pci/smipcie/Kconfig b/drivers/media/pci/smipcie/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_SMIPCIE
-	tristate "SMI PCIe DVBSky cards"
+	bool "SMI PCIe DVBSky cards"
 	depends on DVB_CORE && PCI && I2C
 	select I2C_ALGOBIT
 	select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT

diff --git a/drivers/media/pci/ttpci/Kconfig b/drivers/media/pci/ttpci/Kconfig
@@ -5,7 +5,7 @@ config DVB_AV7110_IR
 	default DVB_AV7110
 
 config DVB_AV7110
-	tristate "AV7110 cards"
+	bool "AV7110 cards"
 	depends on DVB_CORE && PCI && I2C
 	select TTPCI_EEPROM
 	select VIDEO_SAA7146_VV
@@ -40,7 +40,7 @@ config DVB_AV7110
 config DVB_AV7110_OSD
 	bool "AV7110 OSD support"
 	depends on DVB_AV7110
-	default y if DVB_AV7110=y || DVB_AV7110=m
+	default y if DVB_AV7110=y
 	help
 	  The AV7110 firmware provides some code to generate an OnScreenDisplay
 	  on the video output. This is kind of nonstandard and not guaranteed to
@@ -52,7 +52,7 @@ config DVB_AV7110_OSD
 	  All other people say N.
 
 config DVB_BUDGET_CORE
-	tristate "SAA7146 DVB cards (aka Budget, Nova-PCI)"
+	bool "SAA7146 DVB cards (aka Budget, Nova-PCI)"
 	depends on DVB_CORE && PCI && I2C
 	select VIDEO_SAA7146
 	select TTPCI_EEPROM
@@ -62,7 +62,7 @@ config DVB_BUDGET_CORE
 	  MPEG2 decoder.
 
 config DVB_BUDGET
-	tristate "Budget cards"
+	bool "Budget cards"
 	depends on DVB_BUDGET_CORE && I2C
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_VES1X93 if MEDIA_SUBDRV_AUTOSELECT
@@ -88,7 +88,7 @@ config DVB_BUDGET
 	  module will be called budget.
 
 config DVB_BUDGET_CI
-	tristate "Budget cards with onboard CI connector"
+	bool "Budget cards with onboard CI connector"
 	depends on DVB_BUDGET_CORE && I2C
 	select DVB_STV0297 if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
@@ -115,7 +115,7 @@ config DVB_BUDGET_CI
 	  module will be called budget-ci.
 
 config DVB_BUDGET_AV
-	tristate "Budget cards with analog video inputs"
+	bool "Budget cards with analog video inputs"
 	depends on DVB_BUDGET_CORE && I2C
 	select VIDEO_SAA7146_VV
 	depends on VIDEO_DEV	# dependencies of VIDEO_SAA7146_VV
@@ -138,7 +138,7 @@ config DVB_BUDGET_AV
 	  module will be called budget-av.
 
 config DVB_BUDGET_PATCH
-	tristate "AV7110 cards with Budget Patch"
+	bool "AV7110 cards with Budget Patch"
 	depends on DVB_BUDGET_CORE && I2C
 	depends on DVB_AV7110
 	select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT

diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/sti/c8sectpfe/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_C8SECTPFE
-	tristate "STMicroelectronics C8SECTPFE DVB support"
+	bool "STMicroelectronics C8SECTPFE DVB support"
 	depends on PINCTRL && DVB_CORE && I2C
 	depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST
 	select FW_LOADER

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 menuconfig RC_CORE
-	tristate "Remote Controller support"
+	bool "Remote Controller support"
 	depends on INPUT
 	help
 	  Enable support for Remote Controllers on Linux. This is

diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig
@@ -21,7 +21,7 @@ if SPI
 menu "Media SPI Adapters"
 
 config CXD2880_SPI_DRV
-	tristate "Sony CXD2880 SPI support"
+	bool "Sony CXD2880 SPI support"
 	depends on DVB_CORE && SPI
 	default m if !MEDIA_SUBDRV_AUTOSELECT
 	help

diff --git a/drivers/media/usb/as102/Kconfig b/drivers/media/usb/as102/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_AS102
-	tristate "Abilis AS102 DVB receiver"
+	bool "Abilis AS102 DVB receiver"
 	depends on DVB_CORE && USB && I2C && INPUT
 	select FW_LOADER
 	help

diff --git a/drivers/media/usb/au0828/Kconfig b/drivers/media/usb/au0828/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 config VIDEO_AU0828
-	tristate "Auvitek AU0828 support"
+	bool "Auvitek AU0828 support"
 	depends on I2C && INPUT && DVB_CORE && USB && VIDEO_V4L2
 	select MEDIA_CONTROLLER
 	select MEDIA_CONTROLLER_DVB
@@ -35,7 +35,7 @@ config VIDEO_AU0828_V4L2
 config VIDEO_AU0828_RC
 	bool "AU0828 Remote Controller support"
 	depends on RC_CORE
-	depends on !(RC_CORE=m && VIDEO_AU0828=y)
+	#depends on !(RC_CORE=m && VIDEO_AU0828=y)
 	depends on VIDEO_AU0828
 	help
 	   Enables Remote Controller support on au0828 driver.
diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_CX231XX
-	tristate "Conexant cx231xx USB video capture support"
+	bool "Conexant cx231xx USB video capture support"
 	depends on VIDEO_DEV && I2C && I2C_MUX
 	select VIDEO_TUNER
 	select VIDEO_TVEEPROM
@@ -39,7 +39,7 @@ config VIDEO_CX231XX_ALSA
 	  module will be called cx231xx-alsa
 
 config VIDEO_CX231XX_DVB
-	tristate "DVB/ATSC Support for Cx231xx based TV cards"
+	bool "DVB/ATSC Support for Cx231xx based TV cards"
 	depends on VIDEO_CX231XX && DVB_CORE
 	select MEDIA_TUNER_XC5000 if MEDIA_SUBDRV_AUTOSELECT
 	select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT