Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 868dbf90 authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block 



The merging of commits 1b6ba46b ("ARM: LPAE: MMU setup for the 3-level
page table format") and b4244738 ("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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent eb50439b

arch/arm/mm/proc-v7.S

+10 −10
Original line number Original line Diff line number Diff line
@@ -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.

	 */

	 */