| From 6df535b25511853d6a10189a80338d7276af6add Mon Sep 17 00:00:00 2001 |
| From: Christian Borntraeger <borntraeger@de.ibm.com> |
| Date: Wed, 18 Dec 2019 09:34:57 +0100 |
| Subject: [PATCH] s390/purgatory: do not build purgatory with kcov, kasan and |
| friends |
| |
| commit c23587c92f6e3260fe3b82bb75b38aa2553b9468 upstream. |
| |
| the purgatory must not rely on functions from the "old" kernel, |
| so we must disable kasan and friends. We also need to have a |
| separate copy of string.c as the default does not build memcmp |
| with KASAN. |
| |
| Reported-by: kbuild test robot <lkp@intel.com> |
| Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> |
| Reviewed-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile |
| index dc1ae4ff79d7..ff318acb3d77 100644 |
| --- a/arch/s390/purgatory/Makefile |
| +++ b/arch/s390/purgatory/Makefile |
| @@ -13,8 +13,10 @@ $(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE |
| $(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE |
| $(call if_changed_rule,as_o_S) |
| |
| -$(obj)/string.o: $(srctree)/arch/s390/lib/string.c FORCE |
| - $(call if_changed_rule,cc_o_c) |
| +KCOV_INSTRUMENT := n |
| +GCOV_PROFILE := n |
| +UBSAN_SANITIZE := n |
| +KASAN_SANITIZE := n |
| |
| KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes |
| KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare |
| diff --git a/arch/s390/purgatory/string.c b/arch/s390/purgatory/string.c |
| new file mode 100644 |
| index 000000000000..c98c22a72db7 |
| --- /dev/null |
| +++ b/arch/s390/purgatory/string.c |
| @@ -0,0 +1,3 @@ |
| +// SPDX-License-Identifier: GPL-2.0 |
| +#define __HAVE_ARCH_MEMCMP /* arch function */ |
| +#include "../lib/string.c" |
| -- |
| 2.7.4 |
| |
