diff mbox series

sh: Always enable CONFIG_GENERIC_PCI_IOMAP

Message ID 20181119115910.19390-1-tiwai@suse.de (mailing list archive)
State New, archived
Headers show
Series sh: Always enable CONFIG_GENERIC_PCI_IOMAP | expand

Commit Message

Takashi Iwai Nov. 19, 2018, 11:59 a.m. UTC
CONFIG_GENERIC_PCI_IOMAP is supposed to be set no matter whether
CONFIG_PCI is present or not.  Otherwise the generic header
(asm-generic/pci_iomap.h) won't create dummy functions, and the code
using pci_iomap() and pci_iounmap() will fail due to the lack of the
function definitions / declarations.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 arch/sh/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Takashi Iwai Nov. 26, 2018, 4:13 p.m. UTC | #1
On Mon, 19 Nov 2018 12:59:10 +0100,
Takashi Iwai wrote:
> 
> CONFIG_GENERIC_PCI_IOMAP is supposed to be set no matter whether
> CONFIG_PCI is present or not.  Otherwise the generic header
> (asm-generic/pci_iomap.h) won't create dummy functions, and the code
> using pci_iomap() and pci_iounmap() will fail due to the lack of the
> function definitions / declarations.
> 
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

This is a gentle reminder for this fix.

If anyone has objection against this, I'm going to apply it via sound
git tree, as the code there is obviously a trigger of the bug.


thanks,

Takashi

> ---
>  arch/sh/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
> index f82a4da7adf3..3d5220ad9e46 100644
> --- a/arch/sh/Kconfig
> +++ b/arch/sh/Kconfig
> @@ -36,6 +36,8 @@ config SUPERH
>  	select RTC_LIB
>  	select GENERIC_ATOMIC64
>  	select GENERIC_IRQ_SHOW
> +	select GENERIC_PCI_IOMAP
> +	select NO_GENERIC_PCI_IOPORT_MAP
>  	select GENERIC_SMP_IDLE_THREAD
>  	select GENERIC_IDLE_POLL_SETUP
>  	select GENERIC_CLOCKEVENTS
> @@ -859,8 +861,6 @@ config PCI
>  	bool "PCI support"
>  	depends on SYS_SUPPORTS_PCI
>  	select PCI_DOMAINS
> -	select GENERIC_PCI_IOMAP
> -	select NO_GENERIC_PCI_IOPORT_MAP
>  	help
>  	  Find out whether you have a PCI motherboard. PCI is the name of a
>  	  bus system, i.e. the way the CPU talks to the other stuff inside
> -- 
> 2.19.1
>
diff mbox series

Patch

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index f82a4da7adf3..3d5220ad9e46 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -36,6 +36,8 @@  config SUPERH
 	select RTC_LIB
 	select GENERIC_ATOMIC64
 	select GENERIC_IRQ_SHOW
+	select GENERIC_PCI_IOMAP
+	select NO_GENERIC_PCI_IOPORT_MAP
 	select GENERIC_SMP_IDLE_THREAD
 	select GENERIC_IDLE_POLL_SETUP
 	select GENERIC_CLOCKEVENTS
@@ -859,8 +861,6 @@  config PCI
 	bool "PCI support"
 	depends on SYS_SUPPORTS_PCI
 	select PCI_DOMAINS
-	select GENERIC_PCI_IOMAP
-	select NO_GENERIC_PCI_IOPORT_MAP
 	help
 	  Find out whether you have a PCI motherboard. PCI is the name of a
 	  bus system, i.e. the way the CPU talks to the other stuff inside