diff options
| author | Nicolas Pitre <nico@cam.org> | 2006-01-18 17:38:51 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-18 17:38:51 -0500 |
| commit | 265d5e48dd1fd4c53f2b454e1e82b7713ddca37e (patch) | |
| tree | 4500f524f9aee7f4d0a818381f77c156cc946fa7 /arch | |
| parent | 5e0974459df9acd6cd0952c98a58816ad820ae66 (diff) | |
[ARM] 3272/1: fix kernel decompressor crash
Patch from Nicolas Pitre
Commit f4619025a51747a3788fd1bb6bdc46e368a889a7 broke the kernel
decompressor (at least on PXA). Here's the fix.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index aaa47400eb9c..db3389d8e027 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -334,7 +334,7 @@ __setup_mmu: sub r3, r4, #16384 @ Page directory size | |||
| 334 | mov r1, #0x12 | 334 | mov r1, #0x12 |
| 335 | orr r1, r1, #3 << 10 | 335 | orr r1, r1, #3 << 10 |
| 336 | add r2, r3, #16384 | 336 | add r2, r3, #16384 |
| 337 | 1: cmp r1, r8 @ if virt > start of RAM | 337 | 1: cmp r1, r9 @ if virt > start of RAM |
| 338 | orrhs r1, r1, #0x0c @ set cacheable, bufferable | 338 | orrhs r1, r1, #0x0c @ set cacheable, bufferable |
| 339 | cmp r1, r10 @ if virt > end of RAM | 339 | cmp r1, r10 @ if virt > end of RAM |
| 340 | bichs r1, r1, #0x0c @ clear cacheable, bufferable | 340 | bichs r1, r1, #0x0c @ clear cacheable, bufferable |