Commit b6531456 authored by Mark Rutland's avatar Mark Rutland
Browse files

arm64: factor out PAGE_* and CONT_* definitions 



Some headers rely on PAGE_* definitions from <asm/page.h>, but cannot
include this due to potential circular includes. For example, a number
of definitions in <asm/memory.h> rely on PAGE_SHIFT, and <asm/page.h>
includes <asm/memory.h>.

This requires users of these definitions to include both headers, which
is fragile and error-prone.

This patch ameliorates matters by moving the basic definitions out to a
new header, <asm/page-def.h>. Both <asm/page.h> and <asm/memory.h> are
updated to include this, avoiding this fragility, and avoiding the
possibility of circular include dependencies.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Tested-by: default avatarLaura Abbott <labbott@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
parent 34be98f4

arch/arm64/include/asm/memory.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/const.h>

#include <linux/types.h>

#include <asm/bug.h>

#include <asm/page-def.h>

#include <asm/sizes.h>



/*

arch/arm64/include/asm/page-def.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Based on arch/arm/include/asm/page.h

 *

 * Copyright (C) 1995-2003 Russell King

 * Copyright (C) 2017 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifndef __ASM_PAGE_DEF_H

#define __ASM_PAGE_DEF_H



#include <linux/const.h>



/* PAGE_SHIFT determines the page size */

/* CONT_SHIFT determines the number of pages which can be tracked together  */

#define PAGE_SHIFT		CONFIG_ARM64_PAGE_SHIFT

#define CONT_SHIFT		CONFIG_ARM64_CONT_SHIFT

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

#define PAGE_MASK		(~(PAGE_SIZE-1))



#define CONT_SIZE		(_AC(1, UL) << (CONT_SHIFT + PAGE_SHIFT))

#define CONT_MASK		(~(CONT_SIZE-1))



#endif /* __ASM_PAGE_DEF_H */

arch/arm64/include/asm/page.h

+1 −11
Original line number Diff line number Diff line
@@ -19,17 +19,7 @@ 
#ifndef __ASM_PAGE_H

#define __ASM_PAGE_H



#include <linux/const.h>



/* PAGE_SHIFT determines the page size */

/* CONT_SHIFT determines the number of pages which can be tracked together  */

#define PAGE_SHIFT		CONFIG_ARM64_PAGE_SHIFT

#define CONT_SHIFT		CONFIG_ARM64_CONT_SHIFT

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

#define PAGE_MASK		(~(PAGE_SIZE-1))



#define CONT_SIZE		(_AC(1, UL) << (CONT_SHIFT + PAGE_SHIFT))

#define CONT_MASK		(~(CONT_SIZE-1))

#include <asm/page-def.h>



#ifndef __ASSEMBLY__

CRA Git | Maintained and supported by SUSTech CRA and CCSE