summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2020-05-29 22:40:58 +0200
committerPeter Zijlstra <peterz@infradead.org>2020-07-10 12:00:01 +0200
commit48017e5481ce85ba52c4cff082cad5f021c4b413 (patch)
treebe97431b1bbe5e160be859c67c7ecd2bc6aaa30f /arch
parentba1f2b2eaa2a529dba722507c55ff3d761d325dd (diff)
downloadlinux-48017e5481ce85ba52c4cff082cad5f021c4b413.tar.bz2
sparc64: Fix asm/percpu.h build error
In order to break a header dependency between lockdep and task_struct, I need per-cpu stuff from lockdep. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Ingo Molnar <mingo@kernel.org> Acked-by: David S. Miller <davem@davemloft.net> Link: https://lkml.kernel.org/r/20200623083721.277992771@infradead.org
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/include/asm/percpu_64.h2
-rw-r--r--arch/sparc/include/asm/trap_block.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/percpu_64.h b/arch/sparc/include/asm/percpu_64.h
index 32ef6f05cc56..a8786a4b90b6 100644
--- a/arch/sparc/include/asm/percpu_64.h
+++ b/arch/sparc/include/asm/percpu_64.h
@@ -4,7 +4,9 @@
#include <linux/compiler.h>
+#ifndef BUILD_VDSO
register unsigned long __local_per_cpu_offset asm("g5");
+#endif
#ifdef CONFIG_SMP
diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h
index 0f6d0c4f6683..ace0d48e837e 100644
--- a/arch/sparc/include/asm/trap_block.h
+++ b/arch/sparc/include/asm/trap_block.h
@@ -2,6 +2,8 @@
#ifndef _SPARC_TRAP_BLOCK_H
#define _SPARC_TRAP_BLOCK_H
+#include <linux/threads.h>
+
#include <asm/hypervisor.h>
#include <asm/asi.h>