From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 13 Apr 2017 05:07:03 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
X-Git-Tag: release-20171130_firefly~4^2~100^2~151
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=64fb55641f2f70959dddb122595b418a9c3c9187;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
	arch/arm64/Kconfig: keep ARCH_MMAP_RND_BITS_MIN etc config
---

64fb55641f2f70959dddb122595b418a9c3c9187
diff --cc arch/arm64/Kconfig
index bf87f37e84b2,82bff5734ac0..5c74ad90a447
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -114,33 -112,18 +114,45 @@@ config ARCH_PHYS_ADDR_T_64BI
  config MMU
  	def_bool y
  
 +config ARCH_MMAP_RND_BITS_MIN
 +       default 14 if ARM64_64K_PAGES
 +       default 16 if ARM64_16K_PAGES
 +       default 18
 +
 +# max bits determined by the following formula:
 +#  VA_BITS - PAGE_SHIFT - 3
 +config ARCH_MMAP_RND_BITS_MAX
 +       default 19 if ARM64_VA_BITS=36
 +       default 24 if ARM64_VA_BITS=39
 +       default 27 if ARM64_VA_BITS=42
 +       default 30 if ARM64_VA_BITS=47
 +       default 29 if ARM64_VA_BITS=48 && ARM64_64K_PAGES
 +       default 31 if ARM64_VA_BITS=48 && ARM64_16K_PAGES
 +       default 33 if ARM64_VA_BITS=48
 +       default 14 if ARM64_64K_PAGES
 +       default 16 if ARM64_16K_PAGES
 +       default 18
 +
 +config ARCH_MMAP_RND_COMPAT_BITS_MIN
 +       default 7 if ARM64_64K_PAGES
 +       default 9 if ARM64_16K_PAGES
 +       default 11
 +
 +config ARCH_MMAP_RND_COMPAT_BITS_MAX
 +       default 16
 +
+ config ARM64_PAGE_SHIFT
+ 	int
+ 	default 16 if ARM64_64K_PAGES
+ 	default 14 if ARM64_16K_PAGES
+ 	default 12
+ 
+ config ARM64_CONT_SHIFT
+ 	int
+ 	default 5 if ARM64_64K_PAGES
+ 	default 7 if ARM64_16K_PAGES
+ 	default 4
+ 
  config NO_IOPORT_MAP
  	def_bool y if !PCI