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

Commit 520473b0 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: use PAGE_SIZE when doing aligns rather than hardcoded values 



Signed-off-by: default avatarMike Frysinger <michael.frysinger@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent b07af760

arch/blackfin/kernel/vmlinux.lds.S

+7 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include <asm-generic/vmlinux.lds.h>

#include <asm/mem_map.h>

#include <asm/page.h>



OUTPUT_FORMAT("elf32-bfin")

ENTRY(__start)
@@ -63,8 +64,8 @@ SECTIONS 


	.data :

	{

		. = ALIGN(PAGE_SIZE);

		__sdata = .;

		. = ALIGN(0x2000);

		*(.data.init_task)

		DATA_DATA

		CONSTRUCTORS
@@ -72,14 +73,14 @@ SECTIONS 
		. = ALIGN(32);

		*(.data.cacheline_aligned)



		. = ALIGN(0x2000);

		. = ALIGN(PAGE_SIZE);

		__edata = .;

	}



	. = ALIGN(PAGE_SIZE);

	___init_begin = .;

	.init :

	{

		. = ALIGN(4096);

		__sinittext = .;

		*(.init.text)

		__einittext = .;
@@ -152,9 +153,10 @@ SECTIONS 
		__ebss_b_l1 = .;

	}



	___init_end = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);

	. = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);

	___init_end = ALIGN(PAGE_SIZE);



	.bss LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1) :

	.bss ___init_end :

	{

		. = ALIGN(4);

		___bss_start = .;

include/asm-blackfin/page.h

+4 −0
Original line number Diff line number Diff line
@@ -4,7 +4,11 @@ 
/* PAGE_SHIFT determines the page size */



#define PAGE_SHIFT	12

#ifdef __ASSEMBLY__

#define PAGE_SIZE	(1 << PAGE_SHIFT)

#else

#define PAGE_SIZE	(1UL << PAGE_SHIFT)

#endif

#define PAGE_MASK	(~(PAGE_SIZE-1))



#ifdef __KERNEL__