From 88ab7da936c561aba9ff7492617ffb08f8d08ece Mon Sep 17 00:00:00 2001 From: ad Date: Mon, 9 Jul 2007 20:51:58 +0000 Subject: Merge some of the less invasive changes from the vmlocking branch: - kthread, callout, devsw API changes - select()/poll() improvements - miscellaneous MT safety improvements --- sys/dev/raidframe/rf_reconstruct.c | 7 +++---- sys/dev/raidframe/rf_threadstuff.h | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'sys/dev/raidframe') diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c index af7fa06767c..95fa6d9e050 100644 --- a/sys/dev/raidframe/rf_reconstruct.c +++ b/sys/dev/raidframe/rf_reconstruct.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconstruct.c,v 1.96 2007/06/26 15:22:24 cube Exp $ */ +/* $NetBSD: rf_reconstruct.c,v 1.97 2007/07/09 21:01:20 ad Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,13 +33,12 @@ ************************************************************/ #include -__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.96 2007/06/26 15:22:24 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.97 2007/07/09 21:01:20 ad Exp $"); +#include #include #include #include - -#include #include #include #include diff --git a/sys/dev/raidframe/rf_threadstuff.h b/sys/dev/raidframe/rf_threadstuff.h index 1df767bba3b..1f0f887a3ed 100644 --- a/sys/dev/raidframe/rf_threadstuff.h +++ b/sys/dev/raidframe/rf_threadstuff.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_threadstuff.h,v 1.21 2005/12/11 12:23:37 christos Exp $ */ +/* $NetBSD: rf_threadstuff.h,v 1.22 2007/07/09 21:01:20 ad Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -87,12 +87,12 @@ typedef void *RF_ThreadArg_t; #define RF_SIGNAL_COND(_c_) wakeup_one(&(_c_)) #define RF_BROADCAST_COND(_c_) wakeup(&(_c_)) #define RF_CREATE_THREAD(_handle_, _func_, _arg_, _name_) \ - kthread_create1((void (*)(void *))(_func_), (void *)(_arg_), \ - (struct proc **)&(_handle_), _name_) + kthread_create(PRI_NONE, 0, NULL, (void (*)(void *))(_func_), \ + (void *)(_arg_), (struct lwp **)&(_handle_), _name_) #define RF_CREATE_ENGINE_THREAD(_handle_, _func_, _arg_, _fmt_, _fmt_arg_) \ - kthread_create1((void (*)(void *))(_func_), (void *)(_arg_), \ - (struct proc **)&(_handle_), _fmt_, _fmt_arg_) + kthread_create(PRI_NONE, 0, NULL, (void (*)(void *))(_func_), \ + (void *)(_arg_), (struct lwp **)&(_handle_), _fmt_, _fmt_arg_) #define rf_mutex_init(m) simple_lock_init(m) -- cgit