diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /arch/arm/lib/strncpy_from_user.S | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/arm/lib/strncpy_from_user.S')
| -rw-r--r-- | arch/arm/lib/strncpy_from_user.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S index 36e3741a3772..330373c26dd9 100644 --- a/arch/arm/lib/strncpy_from_user.S +++ b/arch/arm/lib/strncpy_from_user.S | |||
| @@ -31,6 +31,7 @@ USER( ldrplbt r3, [r1], #1) | |||
| 31 | sub r1, r1, #1 @ take NUL character out of count | 31 | sub r1, r1, #1 @ take NUL character out of count |
| 32 | 2: sub r0, r1, ip | 32 | 2: sub r0, r1, ip |
| 33 | mov pc, lr | 33 | mov pc, lr |
| 34 | ENDPROC(__strncpy_from_user) | ||
| 34 | 35 | ||
| 35 | .section .fixup,"ax" | 36 | .section .fixup,"ax" |
| 36 | .align 0 | 37 | .align 0 |