Skip to content

Commit 0cdadfb

Browse files
committed
patches: mainline: Add patch to avoid tnt4882.ko modpost error
I have sent this upstream but it has not been accepted yet. It is not related to ClangBuiltLinux but the error still impacts us, so apply it until it is merged there. Signed-off-by: Nathan Chancellor <[email protected]>
1 parent b05f8b6 commit 0cdadfb

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
From git@z Thu Jan 1 00:00:00 1970
2+
Subject: [PATCH] staging: gpib: Make GPIB_NI_PCI_ISA depend on HAS_IOPORT
3+
From: Nathan Chancellor <[email protected]>
4+
Date: Sat, 23 Nov 2024 13:03:25 -0700
5+
Message-Id: <20241123-gpib-tnt4882-depends-on-has_ioport-v1-1-033c58b64751@kernel.org>
6+
MIME-Version: 1.0
7+
Content-Type: text/plain; charset="utf-8"
8+
Content-Transfer-Encoding: 7bit
9+
10+
After commit 78ecb0375685 ("staging: gpib: make port I/O code
11+
conditional"), building tnt4882.ko on platforms without HAS_IOPORT (such
12+
as hexagon and s390) fails with:
13+
14+
ERROR: modpost: "inb_wrapper" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined!
15+
ERROR: modpost: "inw_wrapper" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined!
16+
ERROR: modpost: "nec7210_locking_ioport_write_byte" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined!
17+
ERROR: modpost: "nec7210_locking_ioport_read_byte" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined!
18+
ERROR: modpost: "outb_wrapper" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined!
19+
ERROR: modpost: "outw_wrapper" [drivers/staging/gpib/tnt4882/tnt4882.ko] undefined!
20+
21+
Only allow tnt4882.ko to be built when CONFIG_HAS_IOPORT is set to avoid
22+
this build failure, as this driver unconditionally needs it.
23+
24+
Fixes: 78ecb0375685 ("staging: gpib: make port I/O code conditional")
25+
Tested-by: Geert Uytterhoeven <[email protected]>
26+
Link: https://lore.kernel.org/r/20241123-gpib-tnt4882-depends-on-has_ioport-v1-1-033c58b64751@kernel.org
27+
Signed-off-by: Nathan Chancellor <[email protected]>
28+
---
29+
drivers/staging/gpib/Kconfig | 1 +
30+
1 file changed, 1 insertion(+)
31+
32+
diff --git a/drivers/staging/gpib/Kconfig b/drivers/staging/gpib/Kconfig
33+
index 95308d15a55516de9118e7ae90a6103ee8c6c003..9ee4323164654916e7ed49190eaf5bb02ce7f045 100644
34+
--- a/drivers/staging/gpib/Kconfig
35+
+++ b/drivers/staging/gpib/Kconfig
36+
@@ -62,6 +62,7 @@ config GPIB_CEC_PCI
37+
config GPIB_NI_PCI_ISA
38+
tristate "NI PCI/ISA compatible boards"
39+
depends on ISA_BUS || PCI || PCMCIA
40+
+ depends on HAS_IOPORT
41+
select GPIB_COMMON
42+
select GPIB_NEC7210
43+
help
44+
45+
---
46+
base-commit: 114eae3c9fde35220cca623840817a740a2eb7b3
47+
change-id: 20241123-gpib-tnt4882-depends-on-has_ioport-bdd24d6e5aec
48+
49+
Best regards,
50+
--
51+
Nathan Chancellor <[email protected]>
52+

patches/mainline/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
20241018_arnd_media_mediatek_vcodec_mark_vdec_vp9_slice_map_counts_eob_coef_noinline.patch
2+
20241123_nathan_staging_gpib_make_gpib_ni_pci_isa_depend_on_has_ioport.patch
23
v2_20241121_nathan_hexagon_disable_constant_extender_optimization_for_llvm_prior_to_19_1_0.patch

0 commit comments

Comments
 (0)