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

Commit 99502d94 authored by Nelson Elhage's avatar Nelson Elhage Committed by Ralf Baechle
Browse files

MIPS: make page.h constants available to assembly. 



page.h includes ifndef __ASSEMBLY__ guards, but PAGE_SIZE and some other
constants are defined using "1UL", which the assembler does not support.
Use the _AC macro from const.h to make them available to assembly (and
linker scripts).

Signed-off-by: default avatarNelson Elhage <nelhage@ksplice.com>
Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 75f45316

arch/mips/include/asm/page.h

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define _ASM_PAGE_H



#include <spaces.h>

#include <linux/const.h>



/*

 * PAGE_SHIFT determines the page size
@@ -29,12 +30,12 @@ 
#ifdef CONFIG_PAGE_SIZE_64KB

#define PAGE_SHIFT	16

#endif

#define PAGE_SIZE	(1UL << PAGE_SHIFT)

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

#define PAGE_MASK       (~((1 << PAGE_SHIFT) - 1))



#ifdef CONFIG_HUGETLB_PAGE

#define HPAGE_SHIFT	(PAGE_SHIFT + PAGE_SHIFT - 3)

#define HPAGE_SIZE	((1UL) << HPAGE_SHIFT)

#define HPAGE_SIZE	(_AC(1,UL) << HPAGE_SHIFT)

#define HPAGE_MASK	(~(HPAGE_SIZE - 1))

#define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)

#endif /* CONFIG_HUGETLB_PAGE */