diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /arch/arm/lib/memzero.S | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/arm/lib/memzero.S')
| -rw-r--r-- | arch/arm/lib/memzero.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S index 51ccc60160fd..abf2508e8221 100644 --- a/arch/arm/lib/memzero.S +++ b/arch/arm/lib/memzero.S | |||
| @@ -53,7 +53,7 @@ ENTRY(__memzero) | |||
| 53 | stmgeia r0!, {r2, r3, ip, lr} @ 4 | 53 | stmgeia r0!, {r2, r3, ip, lr} @ 4 |
| 54 | stmgeia r0!, {r2, r3, ip, lr} @ 4 | 54 | stmgeia r0!, {r2, r3, ip, lr} @ 4 |
| 55 | bgt 3b @ 1 | 55 | bgt 3b @ 1 |
| 56 | LOADREGS(eqfd, sp!, {pc}) @ 1/2 quick exit | 56 | ldmeqfd sp!, {pc} @ 1/2 quick exit |
| 57 | /* | 57 | /* |
| 58 | * No need to correct the count; we're only testing bits from now on | 58 | * No need to correct the count; we're only testing bits from now on |
| 59 | */ | 59 | */ |
| @@ -77,4 +77,4 @@ ENTRY(__memzero) | |||
| 77 | strneb r2, [r0], #1 @ 1 | 77 | strneb r2, [r0], #1 @ 1 |
| 78 | tst r1, #1 @ 1 a byte left over | 78 | tst r1, #1 @ 1 a byte left over |
| 79 | strneb r2, [r0], #1 @ 1 | 79 | strneb r2, [r0], #1 @ 1 |
| 80 | RETINSTR(mov,pc,lr) @ 1 | 80 | mov pc, lr @ 1 |