diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /arch/arm/lib | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/findbit.S | 4 | ||||
| -rw-r--r-- | arch/arm/lib/getconsdata.c | 2 | ||||
| -rw-r--r-- | arch/arm/lib/strrchr.S | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S index e1651904f..3544ac89d 100644 --- a/arch/arm/lib/findbit.S +++ b/arch/arm/lib/findbit.S @@ -53,10 +53,10 @@ ENTRY(find_next_zero_bit) beq Lfindzbit1lp @ If new byte, goto old routine ldrb r3, [r0, r2, lsr#3] orr r3, r3, #0xFF00 @ Set top bits so we wont get confused - stmfd sp!, {r4} + str r4, [sp, #-4]! and r4, r2, #7 mov r3, r3, lsr r4 @ Shift right by no. of bits - ldmfd sp!, {r4} + ldr r4, [sp], #4 and r3, r3, #0xFF teq r3, #0xFF orreq r2, r2, #7 diff --git a/arch/arm/lib/getconsdata.c b/arch/arm/lib/getconsdata.c index aaa7a7ad2..8b6a0affa 100644 --- a/arch/arm/lib/getconsdata.c +++ b/arch/arm/lib/getconsdata.c @@ -91,3 +91,5 @@ unsigned long PAGE_SZ = PAGE_SIZE; unsigned long KSWI_BASE = 0x900000; unsigned long KSWI_SYS_BASE = 0x9f0000; unsigned long SYS_ERROR0 = 0x9f0000; +unsigned long PGOFF_SHIFT = PAGE_SHIFT - 12; +unsigned long PGOFF_MASK = (1 << (PAGE_SHIFT - 12)) - 1; diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S index ad5a46089..c9145d7af 100644 --- a/arch/arm/lib/strrchr.S +++ b/arch/arm/lib/strrchr.S @@ -12,7 +12,7 @@ .text ENTRY(strrchr) - stmfd sp!, {lr} + str lr, [sp, #-4]! mov r3, #0 1: ldrb r2, [r0], #1 teq r2, r1 |