X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/67d1372dfd3fbcab08b66fea80265097e7405859..12e8c5837f747b0a8f7f8c3cd0d1317467cb1a4b:/sys/sys/kernel.h

diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index cc82c36414..ef9c04fc50 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -40,7 +40,7 @@
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/kernel.h,v 1.63.2.9 2002/07/02 23:00:30 archie Exp $
- * $DragonFly: src/sys/sys/kernel.h,v 1.29 2007/07/28 23:24:32 dillon Exp $
+ * $DragonFly: src/sys/sys/kernel.h,v 1.32 2008/08/25 17:11:23 dillon Exp $
  */
 
 #ifndef _SYS_KERNEL_H_
@@ -149,6 +149,7 @@ enum sysinit_sub_id {
 	 * Continue with miscellanious system initialization
 	 */
 	SI_SUB_CREATE_INIT	= 0x2300000,	/* create the init process */
+	SI_SUB_PRE_DRIVERS	= 0x2380000,
 	SI_SUB_DRIVERS		= 0x2400000,	/* Let Drivers initialize */
 	SI_SUB_CONFIGURE	= 0x3800000,	/* Configure devices */
 	SI_SUB_ISWARM		= 0x3c00000,	/* No longer in cold boot */
@@ -233,6 +234,7 @@ struct sysinit {
 	unsigned int	order;			/* init order within subsystem*/
 	sysinit_cfunc_t func;			/* function		*/
 	const void	*udata;			/* multiplexer/argument */
+	const char	*name;
 };
 
 /*
@@ -252,7 +254,8 @@ struct sysinit {
 		subsystem,					\
 		order,						\
 		func,						\
-		ident						\
+		ident,						\
+		#uniquifier                                     \
 	};							\
 	DATA_SET(sysinit_set,uniquifier ## _sys_init);
 
@@ -305,6 +308,7 @@ struct tunable_int {
 	        tunable_int_init, &__tunable_int_ ## line)
 
 #define	TUNABLE_INT_FETCH(path, var)	kgetenv_int((path), (var))
+#define	TUNABLE_LONG_FETCH(path, var)	kgetenv_long((path), (var))
 
 /* Backwards compatibility with the old deprecated TUNABLE_INT_DECL API */
 #define TUNABLE_INT_DECL(path, defval, var)	\
@@ -316,6 +320,8 @@ static void __Tunable_ ## var (void *ignored)	\
 SYSINIT(__Tunable_init_ ## var, SI_BOOT1_TUNABLES, SI_ORDER_MIDDLE, \
 	__Tunable_ ## var , NULL);
 
+#define	TUNABLE_ULONG_FETCH(path, var)	kgetenv_ulong((path), (var))
+
 extern void tunable_quad_init(void *);
 struct tunable_quad {
 	const char *path;
@@ -398,6 +404,7 @@ struct intr_config_hook {
 	void	*ich_arg;
 	const char *ich_desc;
 	int	ich_order;
+	int	ich_ran;
 };
 
 int	config_intrhook_establish (struct intr_config_hook *);