Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a35cf728 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: 882b7ca1 ("ANDROID: GKI: do not export symbol_get/put()")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia28f73a64566438940b876a5d9c1a0137c6304d0
parent 53b501f1

arch/x86/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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:

build.config.allmodconfig

+0 −32
Original line number Diff line number Diff line 
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 \
@@ -38,7 +7,6 @@ function update_config() { 
         -d CPU_BIG_ENDIAN \

         -d STM \

         -d TEST_MEMCAT_P \

         ${SYMBOL_GET_USERS} \

         -e UNWINDER_FRAME_POINTER \



    (cd ${OUT_DIR} && \

drivers/char/agp/Kconfig

+1 −1
Original line number Diff line number Diff line 
# 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---

drivers/gpu/drm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/Kconfig

+1 −1
Original line number Diff line number Diff line 
# 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