diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-26 16:08:09 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-17 05:31:19 -0400 |
commit | 21b2841df19dd223dad198cdf47e77ea7ac25b56 (patch) | |
tree | c00a7daa56ac677af98b4243d6edd56ec9ec546b /arch | |
parent | 63fa71872bdec70f4a82e562fc34f8d87e174774 (diff) |
ARM: zImage: fix comments for cache_on, cache_off and cache_clean_flush
This adds missing registers to the list of corrupted registers and
removes a wrong comment about r9 on entry
While at it the formatting of the comment to cache_off is changed to
resemble the other two.
Acked-by: Eric Miao <eric.miao@canonical.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/compressed/head.S | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 2366613ad502..ca62ff50f84a 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
@@ -339,9 +339,8 @@ params: ldr r0, =params_phys | |||
339 | * r4 = kernel execution address | 339 | * r4 = kernel execution address |
340 | * r7 = architecture number | 340 | * r7 = architecture number |
341 | * r8 = atags pointer | 341 | * r8 = atags pointer |
342 | * r9 = run-time address of "start" (???) | ||
343 | * On exit, | 342 | * On exit, |
344 | * r1, r2, r3, r9, r10, r12 corrupted | 343 | * r0, r1, r2, r3, r9, r10, r12 corrupted |
345 | * This routine must preserve: | 344 | * This routine must preserve: |
346 | * r4, r5, r6, r7, r8 | 345 | * r4, r5, r6, r7, r8 |
347 | */ | 346 | */ |
@@ -777,8 +776,10 @@ proc_types: | |||
777 | * Turn off the Cache and MMU. ARMv3 does not support | 776 | * Turn off the Cache and MMU. ARMv3 does not support |
778 | * reading the control register, but ARMv4 does. | 777 | * reading the control register, but ARMv4 does. |
779 | * | 778 | * |
780 | * On exit, r0, r1, r2, r3, r9, r12 corrupted | 779 | * On exit, |
781 | * This routine must preserve: r4, r6, r7 | 780 | * r0, r1, r2, r3, r9, r12 corrupted |
781 | * This routine must preserve: | ||
782 | * r4, r6, r7 | ||
782 | */ | 783 | */ |
783 | .align 5 | 784 | .align 5 |
784 | cache_off: mov r3, #12 @ cache_off function | 785 | cache_off: mov r3, #12 @ cache_off function |
@@ -851,7 +852,7 @@ __armv3_mmu_cache_off: | |||
851 | * Clean and flush the cache to maintain consistency. | 852 | * Clean and flush the cache to maintain consistency. |
852 | * | 853 | * |
853 | * On exit, | 854 | * On exit, |
854 | * r1, r2, r3, r9, r11, r12 corrupted | 855 | * r1, r2, r3, r9, r10, r11, r12 corrupted |
855 | * This routine must preserve: | 856 | * This routine must preserve: |
856 | * r0, r4, r5, r6, r7 | 857 | * r0, r4, r5, r6, r7 |
857 | */ | 858 | */ |