]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
staging: gpib: Fix i386 build issue
authorDave Penkler <dpenkler@gmail.com>
Wed, 4 Dec 2024 16:21:28 +0000 (17:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Dec 2024 16:29:20 +0000 (17:29 +0100)
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

Reported-by: Guenter Roeck <linux@roeck-us.net>
Closes: https://lore.kernel.org/all/f10e976e-7a04-4454-b38d-39cd18f142da@roeck-us.net/
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")
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Link: https://lore.kernel.org/r/20241204162128.25617-1-dpenkler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gpib/Kconfig

index fb865d5b721ea0d677574c0c3eb2a40190e68468..259f3ff3364676774398459c1de78f9e886b3558 100644 (file)
@@ -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
@@ -63,6 +64,7 @@ config GPIB_NI_PCI_ISA
        tristate "NI PCI/ISA compatible boards"
        depends on ISA_BUS || PCI || PCMCIA
        depends on HAS_IOPORT
+       depends on !X86_PAE
        select GPIB_COMMON
        select GPIB_NEC7210
        help
@@ -86,6 +88,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
@@ -175,6 +178,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