From: Linus Walleij Date: Tue, 16 Aug 2016 07:58:25 +0000 (+0200) Subject: gpio: Fix OF build problem on UM X-Git-Tag: v3.16.39~153 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf0596c691d302260f809c8a5c27c199b737caf4;p=thirdparty%2Fkernel%2Fstable.git gpio: Fix OF build problem on UM commit 2527ecc9195e9c66252af24c4689e8a67cd4ccb9 upstream. The UserMode (UM) Linux build was failing in gpiolib-of as it requires ioremap()/iounmap() to exist, which is absent from UM. The non-existence of IO memory is negatively defined as CONFIG_NO_IOMEM which means we need to depend on HAS_IOMEM. Cc: Geert Uytterhoeven Reported-by: kbuild test robot Signed-off-by: Linus Walleij Signed-off-by: Ben Hutchings --- diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c index 2c81c2c9e8dca..72aad2a9a6b41 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/kvm_mips.c @@ -1211,7 +1211,7 @@ int __init kvm_mips_init(void) */ kvm_mips_gfn_to_pfn = gfn_to_pfn; kvm_mips_release_pfn_clean = kvm_release_pfn_clean; - kvm_mips_is_error_pfn = is_error_pfn; + kvm_mips_is_error_pfn = is_error_noslot_pfn; pr_info("KVM/MIPS Initialized\n"); return 0; diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 4a1b5113e5277..53a2f65fb1664 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -50,6 +50,7 @@ config GPIO_DEVRES config OF_GPIO def_bool y depends on OF + depends on HAS_IOMEM config GPIO_ACPI def_bool y