3.18-stable review patch. If anyone has any objections, please let me know.
------------------ [ Upstream commit 812264550dcba6cdbe84bfac2f27e7d23b5b8733 ] page.h uses '_AC' in the definition of PAGE_SIZE, but doesn't include linux/const.h where this is defined. This produces build warnings when only asm/page.h is included by asm code. Signed-off-by: James Morse <james.mo...@arm.com> Acked-by: Mark Rutland <mark.rutl...@arm.com> Acked-by: Catalin Marinas <catalin.mari...@arm.com> Signed-off-by: Will Deacon <will.dea...@arm.com> Signed-off-by: Sasha Levin <sas...@kernel.org> --- arch/arm64/include/asm/page.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h index 22b16232bd60..677c2bcc3318 100644 --- a/arch/arm64/include/asm/page.h +++ b/arch/arm64/include/asm/page.h @@ -19,6 +19,8 @@ #ifndef __ASM_PAGE_H #define __ASM_PAGE_H +#include <linux/const.h> + /* PAGE_SHIFT determines the page size */ #ifdef CONFIG_ARM64_64K_PAGES #define PAGE_SHIFT 16 -- 2.19.1
