Merge tag 'trace-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[deliverable/linux.git] / arch / arm / mach-exynos / platsmp.c

diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 85c3be63d644470775f95a580aab7cd9ec14ea2a..98ffe1e62ad5d6debe7c087743d728d5730c26d3 100644 (file)
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -264,7 +264,7 @@ int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr)
                        ret = PTR_ERR(boot_reg);
                        goto fail;
                }
-               __raw_writel(boot_addr, boot_reg);
+               writel_relaxed(boot_addr, boot_reg);
                ret = 0;
        }
 fail:
@@ -289,7 +289,7 @@ int exynos_get_boot_addr(u32 core_id, unsigned long *boot_addr)
                        ret = PTR_ERR(boot_reg);
                        goto fail;
                }
-               *boot_addr = __raw_readl(boot_reg);
+               *boot_addr = readl_relaxed(boot_reg);
                ret = 0;
        }
 fail: