diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-28 23:20:26 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-28 23:20:26 (GMT) |
| commit | 76a22271fd14e3fe7660f8646db12f0780fa4fd2 (patch) | |
| tree | d0cf8ffb69c3d4030fa66c43662285f57bea12cb /arch/arm/lib/strncpy_from_user.S | |
| parent | fffcb480e4224f25c965b93fa65541bfc7dd732e (diff) | |
| parent | e033108bf7e585755350b554048229d1fd10a02e (diff) | |
| download | linux-fsl-qoriq-76a22271fd14e3fe7660f8646db12f0780fa4fd2.tar.xz | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3672/1: PXA: don't probe output GPIOs for interrupt
[ARM] 3671/1: ep93xx: add cirrus logic edb9315 support
[ARM] 3370/2: ep93xx: add crunch support
[ARM] 3665/1: crunch: add ptrace support
[ARM] 3664/1: crunch: add signal frame save/restore
[ARM] 3663/1: fix resource->end off-by-one thinko during physmap conversion
[ARM] 3662/1: ixp23xx: don't include asm/hardware.h in uncompress.h
[ARM] 3660/1: Remove legacy defines
[ARM] 3661/1: S3C2412: Fix compilation if CPU_S3C2410 only
[ARM] 3658/1: S3C244X: Change usb-gadget name to s3c2440-usbgadget
[ARM] Remove the __arch_* layer from uaccess.h
Diffstat (limited to 'arch/arm/lib/strncpy_from_user.S')
| -rw-r--r-- | arch/arm/lib/strncpy_from_user.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S index 35649f0..36e3741 100644 --- a/arch/arm/lib/strncpy_from_user.S +++ b/arch/arm/lib/strncpy_from_user.S @@ -20,7 +20,7 @@ * returns the number of characters copied (strlen of copied string), * -EFAULT on exception, or "len" if we fill the whole buffer */ -ENTRY(__arch_strncpy_from_user) +ENTRY(__strncpy_from_user) mov ip, r1 1: subs r2, r2, #1 USER( ldrplbt r3, [r1], #1) |