Skip to contentSkip to conversation

staging: gpib: Fix i386 build issue

PATCH Superseded Dave Penkler 2 participants 2 messages Dec 4, 2024 Staging

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 staging: gpib: Fix i386 build issue

These drivers cast resource_type_t to void * causing the build to fail.

With CONFIG_X86_PAE enabled the resource_size_t type is a 64bit unsigned int which cannot be cast to a 32 bit pointer.

Disable these drivers if X68_PAE is enabled

Fixes e9dc69956d4d ("staging: gpib: Add Computer Boards GPIB driver")
Fixes e1339245eba3 ("staging: gpib: Add Computer Equipment Corporation GPIB driver")
Fixes bb1bd92fa0f2 ("staging: gpib: Add ines GPIB driver")
Fixes 0cd5b05551e0 ("staging: gpib: Add TNT4882 chip based GPIB driver")

---
v1 -> v2 changed pci_resource_start to pci_resource_len for second parameter of ioremap v2 -> v3 add changes for cb7210 and tnt4882 drivers
v3 -> v4 disable build of drivers when X86_PAE is enabled

drivers/staging/gpib/Kconfig | 4 ++++

 1 file changed, 4 insertions(+)
drivers/staging/gpib/Kconfig +4 -0
index a9b811165f6b..a62d7d36ea85 100644
@@ -50,6 +50,7 @@ config GPIB_CEC_PCI
 	tristate "CEC PCI board"
 	depends on PCI
 	depends on HAS_IOPORT
+	depends on !X86_PAE
 	select GPIB_COMMON
 	select GPIB_NEC7210
 	help
@@ -62,6 +63,7 @@ config GPIB_CEC_PCI
 config GPIB_NI_PCI_ISA
 	tristate "NI PCI/ISA compatible boards"
 	depends on ISA_BUS || PCI || PCMCIA
+	depends on !X86_PAE
 	select GPIB_COMMON
 	select GPIB_NEC7210
 	help
@@ -85,6 +87,7 @@ config GPIB_CB7210
        tristate "Measurement Computing compatible boards"
 	depends on HAS_IOPORT
 	depends on ISA_BUS || PCI || PCMCIA
+	depends on !X86_PAE
        select GPIB_COMMON
 	select GPIB_NEC7210
        help
@@ -174,6 +177,7 @@ config GPIB_INES
        tristate "INES"
 	depends on PCI || ISA_BUS || PCMCIA
 	depends on HAS_IOPORT
+	depends on !X86_PAE
        select GPIB_COMMON
        select GPIB_NEC7210
        help
Signature · 1 line
2.47.1
maintainer
#1 lore raw
Quoted 13 lines · Dave Penkler

These drivers cast resource_type_t to void * causing the build to fail.

With CONFIG_X86_PAE enabled the resource_size_t type is a 64bit unsigned int which cannot be cast to a 32 bit pointer.

Disable these drivers if X68_PAE is enabled

Fixes e9dc69956d4d ("staging: gpib: Add Computer Boards GPIB driver")
Fixes e1339245eba3 ("staging: gpib: Add Computer Equipment Corporation GPIB driver")
Fixes bb1bd92fa0f2 ("staging: gpib: Add ines GPIB driver")
Fixes 0cd5b05551e0 ("staging: gpib: Add TNT4882 chip based GPIB driver")
Quoted 4 lines

---
v1 -> v2 changed pci_resource_start to pci_resource_len for second parameter of ioremap v2 -> v3 add changes for cb7210 and tnt4882 drivers
v3 -> v4 disable build of drivers when X86_PAE is enabled

You forgot to sign off on this change :(

v5?

thanks,

greg k-h