Author: imp
Date: Thu Apr 25 06:29:23 2013
New Revision: 249882
URL: http://svnweb.freebsd.org/changeset/base/249882

Log:
  Make it possible to include this file in assembler .S sources.

Modified:
  head/sys/mips/include/pcb.h

Modified: head/sys/mips/include/pcb.h
==============================================================================
--- head/sys/mips/include/pcb.h Thu Apr 25 06:28:19 2013        (r249881)
+++ head/sys/mips/include/pcb.h Thu Apr 25 06:29:23 2013        (r249882)
@@ -42,20 +42,7 @@
 #ifndef _MACHINE_PCB_H_
 #define        _MACHINE_PCB_H_
 
-#include <machine/frame.h>
-
 /*
- * MIPS process control block
- */
-struct pcb
-{
-       struct trapframe pcb_regs;      /* saved CPU and registers */
-       __register_t pcb_context[14];   /* kernel context for resume */
-       void *pcb_onfault;              /* for copyin/copyout faults */
-       register_t pcb_tpc;
-};
-
-/* these match the regnum's in regnum.h
  * used by switch.S
  */
 #define        PCB_REG_S0      0
@@ -73,6 +60,19 @@ struct pcb
 #define        PCB_REG_GP      12
 #define        PCB_REG_PC      13
 
+#ifndef LOCORE
+#include <machine/frame.h>
+
+/*
+ * MIPS process control block
+ */
+struct pcb
+{
+       struct trapframe pcb_regs;      /* saved CPU and registers */
+       __register_t pcb_context[14];   /* kernel context for resume */
+       void *pcb_onfault;              /* for copyin/copyout faults */
+       register_t pcb_tpc;
+};
 
 #ifdef _KERNEL
 extern struct pcb *curpcb;             /* the current running pcb */
@@ -80,5 +80,6 @@ extern struct pcb *curpcb;            /* the curre
 void makectx(struct trapframe *, struct pcb *);
 int savectx(struct pcb *) __returns_twice;
 #endif
+#endif
 
 #endif /* !_MACHINE_PCB_H_ */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to