]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
authorWill Deacon <will.deacon@arm.com>
Fri, 20 Jan 2012 11:01:14 +0000 (12:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 Jan 2012 10:20:06 +0000 (10:20 +0000)
commitba64aec7bcf7cd72945d9e426d8c41fbf1253130
tree685a1d7bbbd677a386d4b533404606a91341ab83
parent7f425ae53f27f353628a0872046ec01e23a5299e
ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block

The merging of commits dee2ec46 ("ARM: LPAE: MMU setup for the 3-level
page table format") and 8a0ac728 ("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>
arch/arm/mm/proc-v7.S