OSDN Git Service

ARM: at91: Replace uses of virt_to_phys with __pa_symbol
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Thu, 24 Aug 2017 11:44:54 +0000 (13:44 +0200)
committerNicolas Ferre <nicolas.ferre@microchip.com>
Mon, 18 Sep 2017 08:05:38 +0000 (10:05 +0200)
The PM code wrongly uses virt_to_phys() instead of __pa_symbol() and was
not updated by commit 64fc2a947a98 ("ARM: 8641/1: treewide: Replace uses of
virt_to_phys with __pa_symbol") because it was not yet in tree.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
arch/arm/mach-at91/pm.c

index 5036f99..849014c 100644 (file)
@@ -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;