Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 006fa259 authored by Russell King's avatar Russell King
Browse files

ARM: fix noMMU kallsyms symbol filtering 



With noMMU, CONFIG_PAGE_OFFSET was not being set correctly.  As there's
no MMU, PAGE_OFFSET should be equal to PHYS_OFFSET in all cases.  This
commit makes that explicit.

Since we do this, we don't need to mess around in asm/memory.h with
ifdefs to sort this out, so let's get rid of that, and there's no point
offering the "Memory split" option for noMMU as that's meaningless
there.

Fixes: b9b32bf7 ("ARM: use linker magic for vectors and vector stubs")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b3634575

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1578,6 +1578,7 @@ config BL_SWITCHER_DUMMY_IF 


choice

	prompt "Memory split"

	depends on MMU

	default VMSPLIT_3G

	help

	  Select the desired split between kernel and user memory.
@@ -1595,6 +1596,7 @@ endchoice 


config PAGE_OFFSET

	hex

	default PHYS_OFFSET if !MMU

	default 0x40000000 if VMSPLIT_1G

	default 0x80000000 if VMSPLIT_2G

	default 0xC0000000

arch/arm/include/asm/memory.h

+3 −6
Original line number Diff line number Diff line
@@ -30,14 +30,15 @@ 
 */

#define UL(x) _AC(x, UL)



/* PAGE_OFFSET - the virtual address of the start of the kernel image */

#define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)



#ifdef CONFIG_MMU



/*

 * PAGE_OFFSET - the virtual address of the start of the kernel image

 * TASK_SIZE - the maximum size of a user space task.

 * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area

 */

#define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)

#define TASK_SIZE		(UL(CONFIG_PAGE_OFFSET) - UL(SZ_16M))

#define TASK_UNMAPPED_BASE	ALIGN(TASK_SIZE / 3, SZ_16M)
@@ -104,10 +105,6 @@ 
#define END_MEM     		(UL(CONFIG_DRAM_BASE) + CONFIG_DRAM_SIZE)

#endif



#ifndef PAGE_OFFSET

#define PAGE_OFFSET		PLAT_PHYS_OFFSET

#endif



/*

 * The module can be at any place in ram in nommu mode.

 */