Re: [PATCH for-lsk-v4.4] arm64: move {PAGE,CONT}_SHIFT into Kconfig

On 10 April 2017 at 19:41, Alex Shi alex.shi@linaro.org wrote:

On 04/10/2017 10:03 PM, Amit Pundir wrote:

...

Or you can just cherry-pick upstream commit 030c4d24447cbf2bd612baea5695952e5f62c042 as is. That build failure information there was more of an FYI :)

It can not simple work since a following conflict found. I will look into it tomorrow.

My apologies for ignoring that. This patch applied cleanly on lsk-v4.4-android branch, so I assumed it will go cleanly on lsk-v4.4 as well but I see the merge conflict on lsk-v4.4 too. I'll rebase the changes and send you the revised patch.

Regards, Amit Pundir

Regards Alex

++<<<<<<< HEAD ++=======

• 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 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
  

++>>>>>>> 030c4d2... arm64: move {PAGE,CONT}_SHIFT into Kconfig config NO_IOPORT_MAP