From: Alex Shi <alex.shi@linaro.org>
Date: Tue, 11 Apr 2017 02:48:42 +0000 (+0800)
Subject: Merge branch 'v4.4/topic/mm-kaslr' into linux-linaro-lsk-v4.4
X-Git-Tag: release-20171130_firefly~4^2~100^2~1^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d2454284af5af30c433f0cc8828e12981271ddc4;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v4.4/topic/mm-kaslr' into linux-linaro-lsk-v4.4
---

d2454284af5af30c433f0cc8828e12981271ddc4
diff --cc arch/arm64/include/asm/page.h
index fbafd0ad16df,344915bfb8eb..fb2617df2de9
--- a/arch/arm64/include/asm/page.h
+++ b/arch/arm64/include/asm/page.h
@@@ -19,20 -19,10 +19,12 @@@
  #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  */
- #ifdef CONFIG_ARM64_64K_PAGES
- #define PAGE_SHIFT		16
- #define CONT_SHIFT		5
- #elif defined(CONFIG_ARM64_16K_PAGES)
- #define PAGE_SHIFT		14
- #define CONT_SHIFT		7
- #else
- #define PAGE_SHIFT		12
- #define CONT_SHIFT		4
- #endif
+ #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))