From: Will Deacon <will.deacon@arm.com>
Date: Fri, 20 Jan 2012 11:01:14 +0000 (+0100)
Subject: ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
X-Git-Tag: v3.3-rc2~18^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=868dbf905245a524496a0535982ed21ad3be5585;p=pandora-kernel.git

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: 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>
---

Reading git-diff-tree failed