diff options
| author | Rabin Vincent <rabin@rab.in> | 2014-05-03 13:19:17 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-25 18:44:24 -0400 |
| commit | f9ff907b0af561dcde4683f7c9f71dc0f41d3be3 (patch) | |
| tree | 43e166ff026b9e083e60cf2e4a3aaf61412f55e8 | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
ARM: 8048/1: fix v7-M setup stack location
__v7m_setup_stack currently sits in the .proc.info.init section, and
thus creates a bogus proc info entry (which by the way matches any
unknown CPU IDs, due to the entry's mask being 0). Move it out of
there.
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mm/proc-v7m.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S index 0c93588fcb91..1ca37c72f12f 100644 --- a/arch/arm/mm/proc-v7m.S +++ b/arch/arm/mm/proc-v7m.S | |||
| @@ -123,6 +123,11 @@ __v7m_setup: | |||
| 123 | mov pc, lr | 123 | mov pc, lr |
| 124 | ENDPROC(__v7m_setup) | 124 | ENDPROC(__v7m_setup) |
| 125 | 125 | ||
| 126 | .align 2 | ||
| 127 | __v7m_setup_stack: | ||
| 128 | .space 4 * 8 @ 8 registers | ||
| 129 | __v7m_setup_stack_top: | ||
| 130 | |||
| 126 | define_processor_functions v7m, dabort=nommu_early_abort, pabort=legacy_pabort, nommu=1 | 131 | define_processor_functions v7m, dabort=nommu_early_abort, pabort=legacy_pabort, nommu=1 |
| 127 | 132 | ||
| 128 | .section ".rodata" | 133 | .section ".rodata" |
| @@ -152,6 +157,3 @@ __v7m_proc_info: | |||
| 152 | .long nop_cache_fns @ proc_info_list.cache | 157 | .long nop_cache_fns @ proc_info_list.cache |
| 153 | .size __v7m_proc_info, . - __v7m_proc_info | 158 | .size __v7m_proc_info, . - __v7m_proc_info |
| 154 | 159 | ||
| 155 | __v7m_setup_stack: | ||
| 156 | .space 4 * 8 @ 8 registers | ||
| 157 | __v7m_setup_stack_top: | ||
