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

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/page.h
index fbafd0ad16df768fa7966a769014db5020294c41,344915bfb8eb53d6d0220dcee46b91f433de866d..fb2617df2de979f6bce76efe14ac92eaa7753cb5
--- 1/arch/arm64/include/asm/page.h
--- 2/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))