diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-08 10:48:00 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-08 10:48:00 (GMT) |
| commit | a1a8ba2d4a7cf9884b97b733b45692f9114c5132 (patch) | |
| tree | 3b342c5071c347bdfa0fe6bf9274c30c75ea18d3 /arch/arm64/lib/strnlen.S | |
| parent | b2f9d678e28ca71ce650eac82f26dd287b47e89a (diff) | |
| parent | e2857b8f11a289ed2b61d18d0665e05c1053c446 (diff) | |
| download | linux-a1a8ba2d4a7cf9884b97b733b45692f9114c5132.tar.xz | |
Merge branch 'linus' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/lib/strnlen.S')
| -rw-r--r-- | arch/arm64/lib/strnlen.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/lib/strnlen.S b/arch/arm64/lib/strnlen.S index 2ca6657..eae38da 100644 --- a/arch/arm64/lib/strnlen.S +++ b/arch/arm64/lib/strnlen.S @@ -168,4 +168,4 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ .Lhit_limit: mov len, limit ret -ENDPROC(strnlen) +ENDPIPROC(strnlen) |