From: Sascha Wildner <saw@online.de>
Date: Thu, 8 Sep 2011 17:16:42 +0000 (+0200)
Subject: Fix the VKERNEL/VKERNEL64 build.
X-Git-Tag: v2.12.0~61
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/7773e565e666d3fba6504d41f1337f98e24c2b45

Fix the VKERNEL/VKERNEL64 build.

Stuff dt_lock into <machine/segments.h>.
---

diff --git a/sys/cpu/i386/include/segments.h b/sys/cpu/i386/include/segments.h
index 3d1427f..2b791c8 100644
--- a/sys/cpu/i386/include/segments.h
+++ b/sys/cpu/i386/include/segments.h
@@ -36,7 +36,6 @@
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
  * $FreeBSD: src/sys/i386/include/segments.h,v 1.24 1999/12/29 04:33:07 peter Exp $
- * $DragonFly: src/sys/cpu/i386/include/segments.h,v 1.13 2007/01/08 03:33:37 dillon Exp $
  */
 
 #ifndef _CPU_SEGMENTS_H_
@@ -270,6 +269,7 @@ extern union descriptor gdt[];
 extern struct soft_segment_descriptor gdt_segs[];
 extern struct gate_descriptor *idt;
 extern union descriptor ldt[NLDT];
+extern struct mtx dt_lock;
 
 void	lgdt		(struct region_descriptor *rdp);
 void	lidt		(struct region_descriptor *rdp);
diff --git a/sys/cpu/x86_64/include/segments.h b/sys/cpu/x86_64/include/segments.h
index 06408c3..c2fd80f 100644
--- a/sys/cpu/x86_64/include/segments.h
+++ b/sys/cpu/x86_64/include/segments.h
@@ -263,6 +263,7 @@ struct region_descriptor {
 extern struct user_segment_descriptor gdt[];
 extern struct soft_segment_descriptor gdt_segs[];
 extern struct gate_descriptor *idt;
+extern struct mtx dt_lock;
 
 void	lgdt(struct region_descriptor *rdp);
 void	sdtossd(struct user_segment_descriptor *sdp,
diff --git a/sys/platform/pc32/include/proc.h b/sys/platform/pc32/include/proc.h
index 22a538d..4d3f686 100644
--- a/sys/platform/pc32/include/proc.h
+++ b/sys/platform/pc32/include/proc.h
@@ -34,7 +34,6 @@
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
  * $FreeBSD: src/sys/i386/include/proc.h,v 1.10 1999/08/28 00:44:21 peter Exp $
- * $DragonFly: src/sys/platform/pc32/include/proc.h,v 1.4 2003/06/28 04:16:03 dillon Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
@@ -52,8 +51,4 @@ struct mdproc {
 	struct trapframe *md_regs;	/* registers on current frame */
 };
 
-#ifdef _KERNEL
-extern struct mtx dt_lock;
-#endif
-
 #endif /* !_MACHINE_PROC_H_ */
diff --git a/sys/platform/pc64/include/proc.h b/sys/platform/pc64/include/proc.h
index ccc46e9..4d3f686 100644
--- a/sys/platform/pc64/include/proc.h
+++ b/sys/platform/pc64/include/proc.h
@@ -34,7 +34,6 @@
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
  * $FreeBSD: src/sys/i386/include/proc.h,v 1.10 1999/08/28 00:44:21 peter Exp $
- * $DragonFly: src/sys/platform/pc64/include/proc.h,v 1.1 2007/08/21 19:45:45 corecode Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
@@ -52,8 +51,4 @@ struct mdproc {
 	struct trapframe *md_regs;	/* registers on current frame */
 };
 
-#ifdef _KERNEL
-extern struct mtx dt_lock;
-#endif
-
 #endif /* !_MACHINE_PROC_H_ */