mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
The merging of commits1b6ba46b
("ARM: LPAE: MMU setup for the 3-level page table format") andb4244738
("ARM: 7202/1: Add Cortex-A7 proc info") during the merge window ended up putting the Cortex-A7 proc_info into a code block guarded by !CONFIG_ARM_LPAE. This makes Cortex-A7 platforms unbootable when LPAE is enabled. This patch moves the proc_info structure for Cortex-A7 outside of the guarded block. Cc: Pawel Moll <pawel.moll@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
eb50439b92
commit
868dbf9052
1 changed files with 10 additions and 10 deletions
|
@ -329,16 +329,6 @@ __v7_ca5mp_proc_info:
|
||||||
__v7_proc __v7_ca5mp_setup
|
__v7_proc __v7_ca5mp_setup
|
||||||
.size __v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info
|
.size __v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info
|
||||||
|
|
||||||
/*
|
|
||||||
* ARM Ltd. Cortex A7 processor.
|
|
||||||
*/
|
|
||||||
.type __v7_ca7mp_proc_info, #object
|
|
||||||
__v7_ca7mp_proc_info:
|
|
||||||
.long 0x410fc070
|
|
||||||
.long 0xff0ffff0
|
|
||||||
__v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV
|
|
||||||
.size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ARM Ltd. Cortex A9 processor.
|
* ARM Ltd. Cortex A9 processor.
|
||||||
*/
|
*/
|
||||||
|
@ -350,6 +340,16 @@ __v7_ca9mp_proc_info:
|
||||||
.size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
|
.size __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
|
||||||
#endif /* CONFIG_ARM_LPAE */
|
#endif /* CONFIG_ARM_LPAE */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ARM Ltd. Cortex A7 processor.
|
||||||
|
*/
|
||||||
|
.type __v7_ca7mp_proc_info, #object
|
||||||
|
__v7_ca7mp_proc_info:
|
||||||
|
.long 0x410fc070
|
||||||
|
.long 0xff0ffff0
|
||||||
|
__v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV
|
||||||
|
.size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ARM Ltd. Cortex A15 processor.
|
* ARM Ltd. Cortex A15 processor.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue