Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 5036f996e694..849014c01cf4 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -533,8 +533,8 @@ static void __init at91_pm_backup_init(void)
         }
 
         pm_bu->suspended = 0;
-        pm_bu->canary = virt_to_phys(&canary);
-        pm_bu->resume = virt_to_phys(cpu_resume);
+        pm_bu->canary = __pa_symbol(&canary);
+        pm_bu->resume = __pa_symbol(cpu_resume);
 
         return;