On 04/10/2017 05:26 PM, Amit Pundir wrote:
From: Mark Rutland mark.rutland@arm.com
In some cases (e.g. the awk for CONFIG_RANDOMIZE_TEXT_OFFSET) we would like to make use of PAGE_SHIFT outside of code that can include the usual header files.
Add a new CONFIG_ARM64_PAGE_SHIFT for this, likewise with ARM64_CONT_SHIFT for consistency.
Signed-off-by: Mark Rutland mark.rutland@arm.com Cc: Ard Biesheuvel ard.biesheuvel@linaro.org Cc: Catalin Marinas catalin.marinas@arm.com Cc: Sudeep Holla sudeep.holla@arm.com Cc: Will Deacon will.deacon@arm.com Signed-off-by: Will Deacon will.deacon@arm.com (cherry picked from commit 030c4d24447cbf2bd612baea5695952e5f62c042) Signed-off-by: Amit Pundir amit.pundir@linaro.org
Few arm64 builds (including allmodconfig) are broken in lsk-v4.4 and family, due to missing definition of CONFIG_ARM64_PAGE_SHIFT in arch/arm64/Makefile, while running awk command. This upstream cherry-pick fix those build failures.
Hi Amit,
Above part will cause 'git am' failed: == $ git am ~/[PATCH\ for-lsk-v4.4]\ arm64:\ move\ {PAGE,CONT}_SHIFT\ into\ Kconfig.eml Applying: arm64: move {PAGE,CONT}_SHIFT into Kconfig error: patch failed: arch/arm64/Kconfig:114 error: arch/arm64/Kconfig: patch does not apply Patch failed at 0001 arm64: move {PAGE,CONT}_SHIFT into Kconfig The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". ==
you could add above comments into commit log instead of extra comments. Could you please send again after correction?
Thanks!