summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Semel <semelpaul@gmail.com>2022-03-08 10:30:58 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-03-16 14:26:50 +0100
commitcf04a86d52ae6681ea22ae45b08666458652c7b6 (patch)
tree97c7889b87b7dd45fc9eee0b76c3b163e3b8dca5
parent8b2dc214251aade1126cbb9418b14587c1692b8c (diff)
downloadlinux-stable-cf04a86d52ae6681ea22ae45b08666458652c7b6.tar.gz
linux-stable-cf04a86d52ae6681ea22ae45b08666458652c7b6.tar.bz2
linux-stable-cf04a86d52ae6681ea22ae45b08666458652c7b6.zip
arm64: kasan: fix include error in MTE functions
commit b859ebedd1e730bbda69142fca87af4e712649a1 upstream. Fix `error: expected string literal in 'asm'`. This happens when compiling an ebpf object file that includes `net/net_namespace.h` from linux kernel headers. Include trace: include/net/net_namespace.h:10 include/linux/workqueue.h:9 include/linux/timer.h:8 include/linux/debugobjects.h:6 include/linux/spinlock.h:90 include/linux/workqueue.h:9 arch/arm64/include/asm/spinlock.h:9 arch/arm64/include/generated/asm/qrwlock.h:1 include/asm-generic/qrwlock.h:14 arch/arm64/include/asm/processor.h:33 arch/arm64/include/asm/kasan.h:9 arch/arm64/include/asm/mte-kasan.h:45 arch/arm64/include/asm/mte-def.h:14 Signed-off-by: Paul Semel <paul.semel@datadoghq.com> Fixes: 2cb34276427a ("arm64: kasan: simplify and inline MTE functions") Cc: <stable@vger.kernel.org> # 5.12.x Link: https://lore.kernel.org/r/bacb5387-2992-97e4-0c48-1ed925905bee@gmail.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm64/include/asm/mte-kasan.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h
index e4704a403237..a857bcacf0fe 100644
--- a/arch/arm64/include/asm/mte-kasan.h
+++ b/arch/arm64/include/asm/mte-kasan.h
@@ -5,6 +5,7 @@
#ifndef __ASM_MTE_KASAN_H
#define __ASM_MTE_KASAN_H
+#include <asm/compiler.h>
#include <asm/mte-def.h>
#ifndef __ASSEMBLY__