From 03fa76d5ef681389f102d47836e4a7e8e5a35ee6 Mon Sep 17 00:00:00 2001
From: marcel <marcel@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 2 Jul 2014 23:37:14 +0000
Subject: [PATCH] MFC r263254: Move the implementation of kdb_cpu_trap() from
 <machine/kdb.h> to machdep.c.

git-svn-id: svn://svn.freebsd.org/base/stable/10@268199 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/ia64/ia64/machdep.c | 13 +++++++++++++
 sys/ia64/include/kdb.h  | 12 ++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index 92bbc64cb..ad4270b64 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.c
@@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/elf.h>
 #include <machine/fpu.h>
 #include <machine/intr.h>
+#include <machine/kdb.h>
 #include <machine/mca.h>
 #include <machine/md_var.h>
 #include <machine/pal.h>
@@ -561,6 +562,18 @@ spinlock_exit(void)
 		intr_restore(intr);
 }
 
+void
+kdb_cpu_trap(int vector, int code __unused)
+{
+
+	__asm __volatile("flushrs;;");
+
+	/* Restart after the break instruction. */
+	if (vector == IA64_VEC_BREAK &&
+	    kdb_frame->tf_special.ifa == IA64_FIXED_BREAK)
+		kdb_frame->tf_special.psr += IA64_PSR_RI_1;
+}
+
 void
 map_vhpt(uintptr_t vhpt)
 {
diff --git a/sys/ia64/include/kdb.h b/sys/ia64/include/kdb.h
index 8a9cc3a1e..0304f510f 100644
--- a/sys/ia64/include/kdb.h
+++ b/sys/ia64/include/kdb.h
@@ -35,6 +35,8 @@
 
 #define	KDB_STOPPEDPCB(pc)	(&(pc)->pc_md.pcb)
 
+void kdb_cpu_trap(int, int);
+
 static __inline void
 kdb_cpu_clear_singlestep(void)
 {
@@ -62,14 +64,4 @@ kdb_cpu_sync_icache(unsigned char *addr, size_t size)
 	}
 }
 
-static __inline void
-kdb_cpu_trap(int vector, int _)
-{
-	__asm __volatile("flushrs;;");
-
-	if (vector == IA64_VEC_BREAK &&
-	    kdb_frame->tf_special.ifa == IA64_FIXED_BREAK)
-                kdb_frame->tf_special.psr += IA64_PSR_RI_1;
-}
-
 #endif /* _MACHINE_KDB_H_ */
-- 
2.45.0