Skip to content

Commit

Permalink
powerpc: Use PPC_LONG and PPC_LONG_ALIGN in lib/string.S
Browse files Browse the repository at this point in the history
Replace ifdef clutter with the PPC_LONG and PPC_LONG_ALIGN macros
for readability.

No change to the generated code.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Michael Ellerman authored and Benjamin Herrenschmidt committed Jul 22, 2008
1 parent 551c3c0 commit 76bfdcf
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions arch/powerpc/lib/string.S
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@
#include <asm/ppc_asm.h>

.section __ex_table,"a"
#ifdef CONFIG_PPC64
.align 3
#define EXTBL .llong
#else
.align 2
#define EXTBL .long
#endif
PPC_LONG_ALIGN
.text

_GLOBAL(strcpy)
Expand Down Expand Up @@ -160,9 +154,9 @@ _GLOBAL(__clear_user)
blr

.section __ex_table,"a"
EXTBL 11b,90b
EXTBL 1b,91b
EXTBL 8b,92b
PPC_LONG 11b,90b
PPC_LONG 1b,91b
PPC_LONG 8b,92b
.text

_GLOBAL(__strncpy_from_user)
Expand All @@ -183,7 +177,7 @@ _GLOBAL(__strncpy_from_user)
blr

.section __ex_table,"a"
EXTBL 1b,99b
PPC_LONG 1b,99b
.text

/* r3 = str, r4 = len (> 0), r5 = top (highest addr) */
Expand All @@ -208,4 +202,4 @@ _GLOBAL(__strnlen_user)
blr

.section __ex_table,"a"
EXTBL 1b,99b
PPC_LONG 1b,99b

0 comments on commit 76bfdcf

Please sign in to comment.