svn commit: r206639 - in head/sys: ddb net

[Julian Elischer]

Author: julian
Date: Wed Apr 14 23:06:07 2010
New Revision: 206639
URL: http://svn.freebsd.org/changeset/base/206639

Log:
  Move two copies of the same definition to a common include file.
  
  MFC after: 3 weeks

Modified:
  head/sys/ddb/db_sym.c
  head/sys/net/vnet.c
  head/sys/net/vnet.h

Modified: head/sys/ddb/db_sym.c
==============================================================================
--- head/sys/ddb/db_sym.c	Wed Apr 14 22:03:48 2010	(r206638)
+++ head/sys/ddb/db_sym.c	Wed Apr 14 23:06:07 2010	(r206639)
@@ -64,12 +64,6 @@ static boolean_t	db_line_at_pc(c_db_sym_
 static int db_cpu = -1;
 
 #ifdef VIMAGE
-extern uintptr_t	*__start_set_vnet;
-extern uintptr_t	*__stop_set_vnet;
-
-#define	VNET_START	(uintptr_t)&__start_set_vnet
-#define	VNET_STOP	(uintptr_t)&__stop_set_vnet
-
 static void *db_vnet = NULL;
 #endif
 

Modified: head/sys/net/vnet.c
==============================================================================
--- head/sys/net/vnet.c	Wed Apr 14 22:03:48 2010	(r206638)
+++ head/sys/net/vnet.c	Wed Apr 14 23:06:07 2010	(r206639)
@@ -154,15 +154,6 @@ struct vnet *vnet0;
  */
 
 /*
- * Location of the kernel's 'set_vnet' linker set.
- */
-extern uintptr_t	*__start_set_vnet;
-extern uintptr_t	*__stop_set_vnet;
-
-#define	VNET_START	(uintptr_t)&__start_set_vnet
-#define	VNET_STOP	(uintptr_t)&__stop_set_vnet
-
-/*
  * Number of bytes of data in the 'set_vnet' linker set, and hence the total
  * size of all kernel virtualized global variables, and the malloc(9) type
  * that will be used to allocate it.

Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h	Wed Apr 14 22:03:48 2010	(r206638)
+++ head/sys/net/vnet.h	Wed Apr 14 23:06:07 2010	(r206639)
@@ -92,6 +92,15 @@ struct vnet {
 #include <sys/sx.h>
 
 /*
+ * Location of the kernel's 'set_vnet' linker set.
+ */
+extern uintptr_t	*__start_set_vnet;
+extern uintptr_t	*__stop_set_vnet;
+
+#define	VNET_START	(uintptr_t)&__start_set_vnet
+#define	VNET_STOP	(uintptr_t)&__stop_set_vnet
+
+/*
  * Functions to allocate and destroy virtual network stacks.
  */
 struct vnet *vnet_alloc(void);