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

Commit f6430a93 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

[ARM] 5565/2: Use PAGE_SIZE and RO_DATA() in link script 



Update the link script for ARM to use PAGE_SIZE instead of hard-
coded 4096. Also the old RODATA macro is deprecated
for the RO_DATA(PAGE_SIZE) macro. As a consequence the PAGE_SIZE
was changed from (1UL << PAGE_SHIFT) to (_AC(1,UL) << PAGE_SHIFT)
because the linker does not understand the "UL" suffix to numeric
constants.

Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7aa5514e

arch/arm/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


/* PAGE_SHIFT determines the page size */

#define PAGE_SHIFT		12

#define PAGE_SIZE		(1UL << PAGE_SHIFT)

#define PAGE_SIZE		(_AC(1,UL) << PAGE_SHIFT)

#define PAGE_MASK		(~(PAGE_SIZE-1))



#ifndef __ASSEMBLY__

arch/arm/kernel/vmlinux.lds.S

+8 −7
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <asm-generic/vmlinux.lds.h>

#include <asm/thread_info.h>

#include <asm/memory.h>

#include <asm/page.h>

	

OUTPUT_ARCH(arm)

ENTRY(stext)
@@ -63,7 +64,7 @@ SECTIONS 
			usr/built-in.o(.init.ramfs)

		__initramfs_end = .;

#endif

		. = ALIGN(4096);

		. = ALIGN(PAGE_SIZE);

		__per_cpu_load = .;

		__per_cpu_start = .;

			*(.data.percpu.page_aligned)
@@ -73,7 +74,7 @@ SECTIONS 
#ifndef CONFIG_XIP_KERNEL

		__init_begin = _stext;

		INIT_DATA

		. = ALIGN(4096);

		. = ALIGN(PAGE_SIZE);

		__init_end = .;

#endif

	}
@@ -118,7 +119,7 @@ SECTIONS 
		*(.got)			/* Global offset table		*/

	}



	RODATA

	RO_DATA(PAGE_SIZE)



	_etext = .;			/* End of text and rodata section */
@@ -158,17 +159,17 @@ SECTIONS 
		*(.data.init_task)



#ifdef CONFIG_XIP_KERNEL

		. = ALIGN(4096);

		. = ALIGN(PAGE_SIZE);

		__init_begin = .;

		INIT_DATA

		. = ALIGN(4096);

		. = ALIGN(PAGE_SIZE);

		__init_end = .;

#endif



		. = ALIGN(4096);

		. = ALIGN(PAGE_SIZE);

		__nosave_begin = .;

		*(.data.nosave)

		. = ALIGN(4096);

		. = ALIGN(PAGE_SIZE);

		__nosave_end = .;



		/*