svn commit: r268199 - in stable/10/sys/ia64: ia64 include

[Marcel Moolenaar]

Author: marcel
Date: Wed Jul  2 23:37:14 2014
New Revision: 268199
URL: http://svnweb.freebsd.org/changeset/base/268199

Log:
  MFC r263254: Move the implementation of kdb_cpu_trap() from <machine/kdb.h>
  to machdep.c.

Modified:
  stable/10/sys/ia64/ia64/machdep.c
  stable/10/sys/ia64/include/kdb.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ia64/ia64/machdep.c
==============================================================================
--- stable/10/sys/ia64/ia64/machdep.c	Wed Jul  2 23:33:07 2014	(r268198)
+++ stable/10/sys/ia64/ia64/machdep.c	Wed Jul  2 23:37:14 2014	(r268199)
@@ -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>
@@ -562,6 +563,18 @@ spinlock_exit(void)
 }
 
 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)
 {
 	pt_entry_t pte;

Modified: stable/10/sys/ia64/include/kdb.h
==============================================================================
--- stable/10/sys/ia64/include/kdb.h	Wed Jul  2 23:33:07 2014	(r268198)
+++ stable/10/sys/ia64/include/kdb.h	Wed Jul  2 23:37:14 2014	(r268199)
@@ -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,
 	}
 }
 
-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_ */