From c4679d743aa64ff95437a92d17f186eb6758168b Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Mon, 10 Feb 2014 23:12:52 +0100
Subject: pc64: return up in RUSER (BP) for devproc kregs file

---
 sys/src/9/pc64/mkfile | 2 +-
 sys/src/9/pc64/trap.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/src/9/pc64/mkfile b/sys/src/9/pc64/mkfile
index 1f7729bb3..48c8aa047 100644
--- a/sys/src/9/pc64/mkfile
+++ b/sys/src/9/pc64/mkfile
@@ -143,7 +143,7 @@ sd53c8xx.i:	sd53c8xx.n
 	aux/na $prereq > $target
 
 acid:V:
-	$CC -a -w -I. -. ../pc/i8253.c>acid
+	$CC -a -w main.c>acid
 
 %.clean:V:
 	rm -f $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* apbootstrap.h init.h $PCHEADERS
diff --git a/sys/src/9/pc64/trap.c b/sys/src/9/pc64/trap.c
index f40429bff..27f387233 100644
--- a/sys/src/9/pc64/trap.c
+++ b/sys/src/9/pc64/trap.c
@@ -1051,6 +1051,7 @@ setkernur(Ureg* ureg, Proc* p)
 {
 	ureg->pc = p->sched.pc;
 	ureg->sp = p->sched.sp+8;
+	ureg->r14 = (uintptr)p;
 }
 
 uintptr
-- 
cgit v1.2.3