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

Commit d4084645 authored by Alexey Brodkin's avatar Alexey Brodkin Committed by Vineet Gupta
Browse files

ARC: mm: use generic macros _BITUL()/_AC() 



Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent 8840e14c

arch/arc/include/asm/pgtable.h

+4 −7
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <asm/page.h>

#include <asm/mmu.h>

#include <asm-generic/pgtable-nopmd.h>

#include <linux/const.h>



/**************************************************************************

 * Page Table Flags
@@ -207,13 +208,9 @@ 
#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)	/* vaddr span, not PDG sz */

#define PGDIR_MASK	(~(PGDIR_SIZE-1))



#ifdef __ASSEMBLY__

#define	PTRS_PER_PTE	(1 << BITS_FOR_PTE)

#define	PTRS_PER_PGD	(1 << BITS_FOR_PGD)

#else

#define	PTRS_PER_PTE	(1UL << BITS_FOR_PTE)

#define	PTRS_PER_PGD	(1UL << BITS_FOR_PGD)

#endif

#define	PTRS_PER_PTE	_BITUL(BITS_FOR_PTE)

#define	PTRS_PER_PGD	_BITUL(BITS_FOR_PGD)



/*

 * Number of entries a user land program use.

 * TASK_SIZE is the maximum vaddr that can be used by a userland program.

arch/arc/include/uapi/asm/page.h

+4 −7
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef _UAPI__ASM_ARC_PAGE_H

#define _UAPI__ASM_ARC_PAGE_H



#include <linux/const.h>



/* PAGE_SHIFT determines the page size */

#if defined(CONFIG_ARC_PAGE_SIZE_16K)

#define PAGE_SHIFT 14
@@ -25,13 +27,8 @@ 
#define PAGE_SHIFT 13

#endif



#ifdef __ASSEMBLY__

#define PAGE_SIZE	(1 << PAGE_SHIFT)

#define PAGE_OFFSET	(0x80000000)

#else

#define PAGE_SIZE	(1UL << PAGE_SHIFT)	/* Default 8K */

#define PAGE_OFFSET	(0x80000000UL)		/* Kernel starts at 2G onwards */

#endif

#define PAGE_SIZE	_BITUL(PAGE_SHIFT)	/* Default 8K */

#define PAGE_OFFSET	_AC(0x80000000, UL)	/* Kernel starts at 2G onwrds */



#define PAGE_MASK	(~(PAGE_SIZE-1))