summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2015-10-08 11:11:17 +0100
committerJiri Slaby <jslaby@suse.cz>2015-10-28 16:38:20 +0100
commit159f13063abcd778a60b7d69cfe0f7a7df416749 (patch)
tree88a7951bd8b9cf68145e3e2131a36f2a927ebb9e
parentcedcc01d4f2469a889d5027f769e3bdf343ea127 (diff)
arm64: errata: use KBUILD_CFLAGS_MODULE for erratum #843419
commit b6dd8e0719c0d2d01429639a11b7bc2677de240c upstream. Commit df057cc7b4fa ("arm64: errata: add module build workaround for erratum #843419") sets CFLAGS_MODULE to ensure that the large memory model is used by the compiler when building kernel modules. However, CFLAGS_MODULE is an environment variable and intended to be overridden on the command line, which appears to be the case with the Ubuntu kernel packaging system, so use KBUILD_CFLAGS_MODULE instead. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Fixes: df057cc7b4fa ("arm64: errata: add module build workaround for erratum #843419") Reported-by: Dann Frazier <dann.frazier@canonical.com> Tested-by: Dann Frazier <dann.frazier@canonical.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--arch/arm64/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 4148c05df99a..e06f99f5e37a 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -29,7 +29,7 @@ comma = ,
CHECKFLAGS += -D__aarch64__
ifeq ($(CONFIG_ARM64_ERRATUM_843419), y)
-CFLAGS_MODULE += -mcmodel=large
+KBUILD_CFLAGS_MODULE += -mcmodel=large
endif
# Default value