Commit 4e1db26a authored Apr 03, 2013 by Paul Bolle Committed by Russell King Apr 03, 2013

ARM: 7690/1: mm: fix CONFIG_LPAE typos



CONFIG_LPAE doesn't exist: the correct option is CONFIG_ARM_LPAE, so fix
up the two typos under arch/arm/.

The fix to head.S is slightly scary, but this is just for setting up
an early io-mapping for the serial port when running on a big-endian,
LPAE system. Since these systems don't exist in the wild (at least, I
have no access to one outside of kvmtool, which doesn't provide a serial
port suitable for earlyprintk), then we can revisit the code later if it
causes any problems.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent b21e023b

arch/arm/kernel/head.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,7 @@ __create_page_tables:
		addne r6, r6, #1 << SECTION_SHIFT
		strne r6, [r3]

		#if defined(CONFIG_LPAE) && defined(CONFIG_CPU_ENDIAN_BE8)
		#if defined(CONFIG_ARM_LPAE) && defined(CONFIG_CPU_ENDIAN_BE8)
		sub r4, r4, #4 @ Fixup page table pointer
		@ for 64-bit descriptors
		#endif

arch/arm/kernel/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -544,7 +544,7 @@ int __init arm_add_memory(phys_addr_t start, phys_addr_t size)
		size -= start & ~PAGE_MASK;
		bank->start = PAGE_ALIGN(start);

		#ifndef CONFIG_LPAE
		#ifndef CONFIG_ARM_LPAE
		if (bank->start + size < bank->start) {
		printk(KERN_CRIT "Truncating memory at 0x%08llx to fit in "
		"32-bit physical address space\n", (long long)start);