PERFORCE change 147508 for review

[Julian Elischer]

http://perforce.freebsd.org/chv.cgi?CH=147508

Change 147508 by julian at julian_trafmon1 on 2008/08/16 04:40:06

	remove opt_vimage from teh same file in 4 branches
	I wonder how this will work :-)

Affected files ...

.. //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#4 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#8 edit
.. //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#3 edit
.. //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#4 edit

Differences ...

==== //depot/projects/vimage-commit/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ====

@@ -144,8 +144,7 @@
 /*
  * Macros to expand out globals defined by various modules
  * to either a real global or a virtualized instance of one,
- * depending on whether VIMAGE is defined in opt_vimage.h
- * XXX opt_vimage.h not yet present,  more framework to come.
+ * depending on whether VIMAGE is defined in opt_global.h
  * XXX so will always evaluate to the global for now (VIMAGE not defined)
  */
 /* first define modules that supply us information */

==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#8 (text+ko) ====

@@ -39,7 +39,6 @@
 #include "opt_inet6.h"
 #include "opt_inet.h"
 #include "opt_sctp.h"
-#include "opt_vimage.h"
 #include <sys/param.h>
 #include <sys/ktr.h>
 #include <sys/systm.h>
@@ -145,8 +144,7 @@
 /*
  * Macros to expand out globals defined by various modules
  * to either a real global or a virtualized instance of one,
- * depending on whether VIMAGE is defined in opt_vimage.h
- * XXX opt_vimage.h not yet present,  more framework to come.
+ * depending on whether VIMAGE is defined in opt_global.h
  * XXX so will always evaluate to the global for now (VIMAGE not defined)
  */
 /* first define modules that supply us information */

==== //depot/projects/vimage-commit3/src/sys/netinet/sctp_os_bsd.h#3 (text+ko) ====

@@ -39,7 +39,6 @@
 #include "opt_inet6.h"
 #include "opt_inet.h"
 #include "opt_sctp.h"
-#include "opt_vimage.h"
 #include <sys/param.h>
 #include <sys/ktr.h>
 #include <sys/systm.h>
@@ -145,8 +144,7 @@
 /*
  * Macros to expand out globals defined by various modules
  * to either a real global or a virtualized instance of one,
- * depending on whether VIMAGE is defined in opt_vimage.h
- * XXX opt_vimage.h not yet present,  more framework to come.
+ * depending on whether VIMAGE is defined in opt_global.h
  * XXX so will always evaluate to the global for now (VIMAGE not defined)
  */
 /* first define modules that supply us information */

==== //depot/projects/vimage-devel/src/sys/netinet/sctp_os_bsd.h#4 (text+ko) ====

@@ -144,8 +144,7 @@
 /*
  * Macros to expand out globals defined by various modules
  * to either a real global or a virtualized instance of one,
- * depending on whether VIMAGE is defined in opt_vimage.h
- * XXX opt_vimage.h not yet present,  more framework to come.
+ * depending on whether VIMAGE is defined in opt_global.h
  * XXX so will always evaluate to the global for now (VIMAGE not defined)
  */
 /* first define modules that supply us information */