[PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro

- this macro unifies the code to add exception table entries
- additionally use ENTRY()/ENDPROC() at more places

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>

3 files changed, 29 insertions, 118 deletions

diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index 75d522e2d058..90b240878520 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -27,20 +27,11 @@
  */
 
 #ifdef CONFIG_64BIT
-#define ADDIB   addib,*
-#define CMPB    cmpb,*
-#define ANDCM   andcm,*
-
         .level  2.0w
 #else
-#define ADDIB   addib,
-#define CMPB    cmpb,
-#define ANDCM   andcm
-
         .level  2.0
 #endif
 
-
 #include <asm/psw.h>
 #include <asm/assembly.h>
 #include <asm/pgtable.h>
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index de1812de5183..10859f53e94f 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -23,19 +23,7 @@
          */
 #define KILL_INSN       break   0,0
 
-#ifdef CONFIG_64BIT
-        .level          2.0w
-#else
-        .level          1.1
-#endif
-
-/* on 64bit pad to 64bit values */
-#ifdef CONFIG_64BIT
-#define ULONG_WORD(x)   .word 0, x
-#else
-#define ULONG_WORD(x)   .word x
-#endif
-
+        .level          LEVEL
 
         .text
 
@@ -603,16 +591,10 @@ cas_action:
            the other for the store. Either return -EFAULT.
            Each of the entries must be relocated. */
         .section __ex_table,"aw"
-        ULONG_WORD(2b - linux_gateway_page)
-        ULONG_WORD(3b - linux_gateway_page)
-        .previous
-
-        .section __ex_table,"aw"
-        ULONG_WORD(1b - linux_gateway_page)
-        ULONG_WORD(3b - linux_gateway_page)
+        ASM_ULONG_INSN (1b - linux_gateway_page), (3b - linux_gateway_page)
+        ASM_ULONG_INSN (2b - linux_gateway_page), (3b - linux_gateway_page)
         .previous
 
-end_compare_and_swap:
 
         /* Make sure nothing else is placed on this page */
         .align ASM_PAGE_SIZE
@@ -622,7 +604,7 @@ ENTRY(end_linux_gateway_page)
         /* Relocate symbols assuming linux_gateway_page is mapped
            to virtual address 0x0 */
 
-#define LWS_ENTRY(_name_) ULONG_WORD(lws_##_name_ - linux_gateway_page)
+#define LWS_ENTRY(_name_) ASM_ULONG_INSN (lws_##_name_ - linux_gateway_page)
 
         .section .rodata,"a"
 
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index 58ca443100a2..347bb922e6d0 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -35,7 +35,7 @@
 #define DPRINTF(fmt, args...)
 #endif
 
-#ifdef __LP64__
+#ifdef CONFIG_64BIT
 #define RFMT "%016lx"
 #else
 #define RFMT "%08lx"
@@ -150,15 +150,8 @@ static int emulate_ldh(struct pt_regs *regs, int toreg)
 "4:     ldi     -2, %1\n"
         FIXUP_BRANCH(3b)
 "       .previous\n"
-"       .section __ex_table,\"aw\"\n"
-#ifdef __LP64__
-"       .dword  1b,4b\n"
-"       .dword  2b,4b\n"
-#else
-"       .word   1b,4b\n"
-"       .word   2b,4b\n"
-#endif
-"       .previous\n"
+        ASM_EXCEPTIONTABLE_ENTRY(1b, 4b)
+        ASM_EXCEPTIONTABLE_ENTRY(2b, 4b)
         : "=r" (val), "=r" (ret)
         : "0" (val), "r" (saddr), "r" (regs->isr)
         : "r20", FIXUP_BRANCH_CLOBBER );
@@ -195,15 +188,8 @@ static int emulate_ldw(struct pt_regs *regs, int toreg, int flop)
 "4:     ldi     -2, %1\n"
         FIXUP_BRANCH(3b)
 "       .previous\n"
-"       .section __ex_table,\"aw\"\n"
-#ifdef __LP64__
-"       .dword  1b,4b\n"
-"       .dword  2b,4b\n"
-#else
-"       .word   1b,4b\n"
-"       .word   2b,4b\n"
-#endif
-"       .previous\n"
+        ASM_EXCEPTIONTABLE_ENTRY(1b, 4b)
+        ASM_EXCEPTIONTABLE_ENTRY(2b, 4b)
         : "=r" (val), "=r" (ret)
         : "0" (val), "r" (saddr), "r" (regs->isr)
         : "r19", "r20", FIXUP_BRANCH_CLOBBER );
@@ -227,7 +213,7 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)
                 regs->isr, regs->ior, toreg);
 #ifdef CONFIG_PA20
 
-#ifndef __LP64__
+#ifndef CONFIG_64BIT
         if (!flop)
                 return -1;
 #endif
@@ -246,15 +232,8 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)
 "4:     ldi     -2, %1\n"
         FIXUP_BRANCH(3b)
 "       .previous\n"
-"       .section __ex_table,\"aw\"\n"
-#ifdef __LP64__
-"       .dword  1b,4b\n"
-"       .dword  2b,4b\n"
-#else
-"       .word   1b,4b\n"
-"       .word   2b,4b\n"
-#endif
-"       .previous\n"
+        ASM_EXCEPTIONTABLE_ENTRY(1b,4b)
+        ASM_EXCEPTIONTABLE_ENTRY(2b,4b)
         : "=r" (val), "=r" (ret)
         : "0" (val), "r" (saddr), "r" (regs->isr)
         : "r19", "r20", FIXUP_BRANCH_CLOBBER );
@@ -278,17 +257,9 @@ static int emulate_ldd(struct pt_regs *regs, int toreg, int flop)
 "5:     ldi     -2, %2\n"
         FIXUP_BRANCH(4b)
 "       .previous\n"
-"       .section __ex_table,\"aw\"\n"
-#ifdef __LP64__
-"       .dword  1b,5b\n"
-"       .dword  2b,5b\n"
-"       .dword  3b,5b\n"
-#else
-"       .word   1b,5b\n"
-"       .word   2b,5b\n"
-"       .word   3b,5b\n"
-#endif
-"       .previous\n"
+        ASM_EXCEPTIONTABLE_ENTRY(1b,5b)
+        ASM_EXCEPTIONTABLE_ENTRY(2b,5b)
+        ASM_EXCEPTIONTABLE_ENTRY(3b,5b)
         : "=r" (valh), "=r" (vall), "=r" (ret)
         : "0" (valh), "1" (vall), "r" (saddr), "r" (regs->isr)
         : "r19", "r20", FIXUP_BRANCH_CLOBBER );
@@ -328,15 +299,8 @@ static int emulate_sth(struct pt_regs *regs, int frreg)
 "4:     ldi     -2, %0\n"
         FIXUP_BRANCH(3b)
 "       .previous\n"
-"       .section __ex_table,\"aw\"\n"
-#ifdef __LP64__
-"       .dword  1b,4b\n"
-"       .dword  2b,4b\n"
-#else
-"       .word   1b,4b\n"
-"       .word   2b,4b\n"
-#endif
-"       .previous\n"
+        ASM_EXCEPTIONTABLE_ENTRY(1b,4b)
+        ASM_EXCEPTIONTABLE_ENTRY(2b,4b)
         : "=r" (ret)
         : "r" (val), "r" (regs->ior), "r" (regs->isr)
         : "r19", FIXUP_BRANCH_CLOBBER );
@@ -382,15 +346,8 @@ static int emulate_stw(struct pt_regs *regs, int frreg, int flop)
 "4:     ldi     -2, %0\n"
         FIXUP_BRANCH(3b)
 "       .previous\n"
-"       .section __ex_table,\"aw\"\n"
-#ifdef __LP64__
-"       .dword  1b,4b\n"
-"       .dword  2b,4b\n"
-#else
-"       .word   1b,4b\n"
-"       .word   2b,4b\n"
-#endif
-"       .previous\n"
+        ASM_EXCEPTIONTABLE_ENTRY(1b,4b)
+        ASM_EXCEPTIONTABLE_ENTRY(2b,4b)
         : "=r" (ret)
         : "r" (val), "r" (regs->ior), "r" (regs->isr)
         : "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );
@@ -413,7 +370,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
                 val,  regs->isr, regs->ior);
 
 #ifdef CONFIG_PA20
-#ifndef __LP64__
+#ifndef CONFIG_64BIT
         if (!flop)
                 return -1;
 #endif
@@ -439,19 +396,10 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
 "6:     ldi     -2, %0\n"
         FIXUP_BRANCH(5b)
 "       .previous\n"
-"       .section __ex_table,\"aw\"\n"
-#ifdef __LP64__
-"       .dword  1b,6b\n"
-"       .dword  2b,6b\n"
-"       .dword  3b,6b\n"
-"       .dword  4b,6b\n"
-#else
-"       .word   1b,6b\n"
-"       .word   2b,6b\n"
-"       .word   3b,6b\n"
-"       .word   4b,6b\n"
-#endif
-"       .previous\n"
+        ASM_EXCEPTIONTABLE_ENTRY(1b,6b)
+        ASM_EXCEPTIONTABLE_ENTRY(2b,6b)
+        ASM_EXCEPTIONTABLE_ENTRY(3b,6b)
+        ASM_EXCEPTIONTABLE_ENTRY(4b,6b)
         : "=r" (ret)
         : "r" (val), "r" (regs->ior), "r" (regs->isr)
         : "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );
@@ -482,21 +430,11 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
 "7:     ldi     -2, %0\n"
         FIXUP_BRANCH(6b)
 "       .previous\n"
-"       .section __ex_table,\"aw\"\n"
-#ifdef __LP64__
-"       .dword  1b,7b\n"
-"       .dword  2b,7b\n"
-"       .dword  3b,7b\n"
-"       .dword  4b,7b\n"
-"       .dword  5b,7b\n"
-#else
-"       .word   1b,7b\n"
-"       .word   2b,7b\n"
-"       .word   3b,7b\n"
-"       .word   4b,7b\n"
-"       .word   5b,7b\n"
-#endif
-"       .previous\n"
+        ASM_EXCEPTIONTABLE_ENTRY(1b,7b)
+        ASM_EXCEPTIONTABLE_ENTRY(2b,7b)
+        ASM_EXCEPTIONTABLE_ENTRY(3b,7b)
+        ASM_EXCEPTIONTABLE_ENTRY(4b,7b)
+        ASM_EXCEPTIONTABLE_ENTRY(5b,7b)
         : "=r" (ret)
         : "r" (valh), "r" (vall), "r" (regs->ior), "r" (regs->isr)
         : "r19", "r20", "r21", "r1", FIXUP_BRANCH_CLOBBER );