Define curthread as an inline function that loads the thread pointer

directly from r13, the pcpu pointer. This guarantees correct behaviour
when the thread migrates to a different CPU.

1 files changed, 10 insertions, 0 deletions

diff --git a/sys/ia64/include/pcpu.h b/sys/ia64/include/pcpu.h
index bc9fe08..9eb8efb 100644
--- a/sys/ia64/include/pcpu.h
+++ b/sys/ia64/include/pcpu.h
@@ -70,6 +70,16 @@ struct pcpu;
 
 register struct pcpu *pcpup __asm__("r13");
 
+static __inline struct thread *
+__curthread(void)
+{
+	struct thread *td;
+
+	__asm __volatile("ld8.acq %0=[r13]" : "=r"(td));
+	return (td);
+}
+#define	curthread	(__curthread())
+
 #define	PCPU_GET(member)	(pcpup->pc_ ## member)
 
 /*