svn commit: r260740 - in stable/9/sys/cddl: compat/opensolaris/kern contrib/opensolaris/uts/common/sys

[Andriy Gapon]

Author: avg
Date: Thu Jan 16 14:30:35 2014
New Revision: 260740
URL: http://svnweb.freebsd.org/changeset/base/260740

Log:
  MFC r258628: opensolaris taskq: some cosmetic changes

Modified:
  stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
  stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
==============================================================================
--- stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c	Thu Jan 16 14:30:26 2014	(r260739)
+++ stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c	Thu Jan 16 14:30:35 2014	(r260740)
@@ -121,7 +121,7 @@ taskq_dispatch(taskq_t *tq, task_func_t 
 		mflag = M_WAITOK;
 	else
 		mflag = M_NOWAIT;
-	/* 
+	/*
 	 * If TQ_FRONT is given, we want higher priority for this task, so it
 	 * can go at the front of the queue.
 	 */
@@ -140,8 +140,6 @@ taskq_dispatch(taskq_t *tq, task_func_t 
 	return ((taskqid_t)(void *)task);
 }
 
-#define	TASKQ_MAGIC	0x74541c
-
 static void
 taskq_run_safe(void *arg, int pending __unused)
 {
@@ -156,7 +154,7 @@ taskq_dispatch_safe(taskq_t *tq, task_fu
 {
 	int prio;
 
-	/* 
+	/*
 	 * If TQ_FRONT is given, we want higher priority for this task, so it
 	 * can go at the front of the queue.
 	 */

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h	Thu Jan 16 14:30:26 2014	(r260739)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h	Thu Jan 16 14:30:35 2014	(r260740)
@@ -70,24 +70,23 @@ struct proc;
 
 extern taskq_t *system_taskq;
 
-extern void	taskq_init(void);
-extern void	taskq_mp_init(void);
+void	taskq_init(void);
+void	taskq_mp_init(void);
 
-extern taskq_t	*taskq_create(const char *, int, pri_t, int, int, uint_t);
-extern taskq_t	*taskq_create_instance(const char *, int, int, pri_t, int,
-    int, uint_t);
-extern taskq_t	*taskq_create_proc(const char *, int, pri_t, int, int,
+taskq_t	*taskq_create(const char *, int, pri_t, int, int, uint_t);
+taskq_t	*taskq_create_instance(const char *, int, int, pri_t, int, int, uint_t);
+taskq_t	*taskq_create_proc(const char *, int, pri_t, int, int,
     struct proc *, uint_t);
-extern taskq_t	*taskq_create_sysdc(const char *, int, int, int,
+taskq_t	*taskq_create_sysdc(const char *, int, int, int,
     struct proc *, uint_t, uint_t);
-extern taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
-extern void	nulltask(void *);
-extern void	taskq_destroy(taskq_t *);
-extern void	taskq_wait(taskq_t *);
-extern void	taskq_suspend(taskq_t *);
-extern int	taskq_suspended(taskq_t *);
-extern void	taskq_resume(taskq_t *);
-extern int	taskq_member(taskq_t *, kthread_t *);
+taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
+void	nulltask(void *);
+void	taskq_destroy(taskq_t *);
+void	taskq_wait(taskq_t *);
+void	taskq_suspend(taskq_t *);
+int	taskq_suspended(taskq_t *);
+void	taskq_resume(taskq_t *);
+int	taskq_member(taskq_t *, kthread_t *);
 
 #endif	/* _KERNEL */