diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:54 +0000 |
| commit | 588956edf5bb33741de41687677f21f5c37671da (patch) | |
| tree | 70508bb41cc7320b3b798cdda405f20deff59a39 /arch/arc/lib/strlen.S | |
| parent | 750d40d7dfd65c0b8babb67137843db8a9a99140 (diff) | |
| parent | 9347e87f7cd66d6ca96ba7d0b4b1cacebea4d096 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-15.02lsk-v3.14-rt-14.02
Diffstat (limited to 'arch/arc/lib/strlen.S')
| -rw-r--r-- | arch/arc/lib/strlen.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arc/lib/strlen.S b/arch/arc/lib/strlen.S index 39759e099696..53cfd5685a5f 100644 --- a/arch/arc/lib/strlen.S +++ b/arch/arc/lib/strlen.S @@ -6,9 +6,9 @@ * published by the Free Software Foundation. */ -#include <asm/linkage.h> +#include <linux/linkage.h> -ARC_ENTRY strlen +ENTRY(strlen) or r3,r0,7 ld r2,[r3,-7] ld.a r6,[r3,-3] @@ -80,4 +80,4 @@ ARC_ENTRY strlen .Learly_end: b.d .Lend sub_s.ne r1,r1,r1 -ARC_EXIT strlen +END(strlen) |