arm64: factor out PAGE_* and CONT_* definitions
authorMark Rutland <mark.rutland@arm.com>
Fri, 14 Jul 2017 18:43:56 +0000 (19:43 +0100)
committerMark Rutland <mark.rutland@arm.com>
Tue, 15 Aug 2017 17:35:00 +0000 (18:35 +0100)
commitb6531456ba279bb7cea5dd2e7b3ec6a3ed0f4668
tree229051e8c43d85c7f066759f7d36ffd15cfd11ce
parent34be98f4944f99076f049a6806fc5f5207a755d3
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: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Will Deacon <will.deacon@arm.com>
Tested-by: Laura 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>
arch/arm64/include/asm/memory.h
arch/arm64/include/asm/page-def.h [new file with mode: 0644]
arch/arm64/include/asm/page.h