summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-11 14:43:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-11 14:43:12 -0700
commitbb5baaa9238ecf8f13b112232c7bbe0d3d598ee8 (patch)
treeb77d9d35d343542f7dd47b0a02a809ec0d25c956
parent57b077939287835b9396a1c3b40d35609cf2fcb8 (diff)
parent3df14264ad9930733a8166e5bd0eccc1727564bb (diff)
downloadlinux-bb5baaa9238ecf8f13b112232c7bbe0d3d598ee8.tar.bz2
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas: "Fix recordmcount build failure on non-arm64 (caused by an arm64 patch)" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: recordmcount: Fix build failure on non arm64
-rw-r--r--scripts/recordmcount.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index e59022b3f125..b9c2ee7ab43f 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -42,6 +42,8 @@
#define R_ARM_THM_CALL 10
#define R_ARM_CALL 28
+#define R_AARCH64_CALL26 283
+
static int fd_map; /* File descriptor for file being modified. */
static int mmap_failed; /* Boolean flag. */
static char gpfx; /* prefix for global symbol name (sometimes '_') */