From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Tue, 17 Jan 2012 12:14:14 +0000 Subject: [PATCH] ARM: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block In-Reply-To: <1326740096-6409-1-git-send-email-will.deacon@arm.com> References: <1326740096-6409-1-git-send-email-will.deacon@arm.com> Message-ID: <20120117121413.GD11475@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Cc: Pawel Moll > Signed-off-by: Will Deacon Acked-by: Catalin Marinas -- Catalin