diff options
| author | Nicolas Pitre <nico@fluxnic.net> | 2009-11-07 01:35:06 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-08 06:58:54 -0500 |
| commit | 158bc5af3d49be49c33dc06ff90c4f754c7d4f1b (patch) | |
| tree | c54fa97f41b290753d873137ea97b3a61fcfb5b5 /arch/arm/kernel | |
| parent | c742239866250a5690485ab775b942c85c6bee63 (diff) | |
ARM: 5784/1: fix early boot machine ID mismatch error display
That code was refactored a long time ago, but one particular label
didn't get adjusted properly which broke the listing of supported
machines.
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/head-common.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index 885a7214418d..b9505aa267c0 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S | |||
| @@ -97,7 +97,7 @@ __error_a: | |||
| 97 | bl printhex8 | 97 | bl printhex8 |
| 98 | adr r0, str_a2 | 98 | adr r0, str_a2 |
| 99 | bl printascii | 99 | bl printascii |
| 100 | adr r3, 3f | 100 | adr r3, 4f |
| 101 | ldmia r3, {r4, r5, r6} @ get machine desc list | 101 | ldmia r3, {r4, r5, r6} @ get machine desc list |
| 102 | sub r4, r3, r4 @ get offset between virt&phys | 102 | sub r4, r3, r4 @ get offset between virt&phys |
| 103 | add r5, r5, r4 @ convert virt addresses to | 103 | add r5, r5, r4 @ convert virt addresses to |