Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / arch / arm64 / kernel / insn.c

diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c
index dd9671cd0bb255b2b5fa32a5e1e5a61b6decaac5..f341866aa810340e47aa9b7283b6b472ca2eae84 100644 (file)
--- a/arch/arm64/kernel/insn.c
+++ b/arch/arm64/kernel/insn.c
@@ -101,9 +101,8 @@ static void __kprobes *patch_map(void *addr, int fixmap)
                return addr;
 
        BUG_ON(!page);
-       set_fixmap(fixmap, page_to_phys(page));
-
-       return (void *) (__fix_to_virt(fixmap) + (uintaddr & ~PAGE_MASK));
+       return (void *)set_fixmap_offset(fixmap, page_to_phys(page) +
+                       (uintaddr & ~PAGE_MASK));
 }
 
 static void __kprobes patch_unmap(int fixmap)