[PATCH] ARM: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block

Catalin Marinas catalin.marinas at arm.com
Tue Jan 17 07:14:14 EST 2012


On Mon, Jan 16, 2012 at 06:54:56PM +0000, Will Deacon wrote:
> 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: Catalin Marinas <catalin.marinas at arm.com>
> Cc: Pawel Moll <pawel.moll at arm.com>
> Signed-off-by: Will Deacon <will.deacon at arm.com>

Acked-by: Catalin Marinas <catalin.marinas at arm.com>

-- 
Catalin



More information about the linux-arm-kernel mailing list