Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 104832
b: refs/heads/master
c: 76bfdcf
h: refs/heads/master
v: v3
  • Loading branch information
Michael Ellerman authored and Benjamin Herrenschmidt committed Jul 22, 2008
1 parent 02c34dc commit fd2374f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 551c3c04b478b987ccd335f1a42362d571b1592d
refs/heads/master: 76bfdcf71c421154b69470e1ce346c8cf4ee1230
18 changes: 6 additions & 12 deletions trunk/arch/powerpc/lib/string.S
View file
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 fd2374f

Please sign in to comment.