Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / arch / parisc / lib / fixup.S

diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S
index f8c45cc2947ded5f5178b7a24cecc16422aa7a12..536ef66bb94b5aa8c46800a968514184b5e2d85d 100644 (file)
--- a/arch/parisc/lib/fixup.S
+++ b/arch/parisc/lib/fixup.S
@@ -38,14 +38,14 @@
        LDREGX \t2(\t1),\t2 
        addil LT%exception_data,%r27
        LDREG RT%exception_data(%r1),\t1
-       /* t1 = &__get_cpu_var(exception_data) */
+       /* t1 = this_cpu_ptr(&exception_data) */
        add,l \t1,\t2,\t1
        /* t1 = t1->fault_ip */
        LDREG EXCDATA_IP(\t1), \t1
        .endm
 #else
        .macro  get_fault_ip t1 t2
-       /* t1 = &__get_cpu_var(exception_data) */
+       /* t1 = this_cpu_ptr(&exception_data) */
        addil LT%exception_data,%r27
        LDREG RT%exception_data(%r1),\t2
        /* t1 = t2->fault_ip */