| kern_synch.c (255067) | kern_synch.c (255745) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1990, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 21 unchanged lines hidden (view full) --- 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 35 */ 36 37#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1982, 1986, 1990, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 21 unchanged lines hidden (view full) --- 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 35 */ 36 37#include <sys/cdefs.h> |
| 38__FBSDID("$FreeBSD: head/sys/kern/kern_synch.c 255067 2013-08-30 10:39:56Z hselasky $"); | 38__FBSDID("$FreeBSD: head/sys/kern/kern_synch.c 255745 2013-09-20 23:06:21Z davide $"); |
| 39 40#include "opt_kdtrace.h" 41#include "opt_ktrace.h" 42#include "opt_sched.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/condvar.h> --- 105 unchanged lines hidden (view full) --- 152 */ 153int 154_sleep(void *ident, struct lock_object *lock, int priority, 155 const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags) 156{ 157 struct thread *td; 158 struct proc *p; 159 struct lock_class *class; | 39 40#include "opt_kdtrace.h" 41#include "opt_ktrace.h" 42#include "opt_sched.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/condvar.h> --- 105 unchanged lines hidden (view full) --- 152 */ 153int 154_sleep(void *ident, struct lock_object *lock, int priority, 155 const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags) 156{ 157 struct thread *td; 158 struct proc *p; 159 struct lock_class *class; |
| 160 int catch, lock_state, pri, rval, sleepq_flags; | 160 uintptr_t lock_state; 161 int catch, pri, rval, sleepq_flags; |
| 161 WITNESS_SAVE_DECL(lock_witness); 162 163 td = curthread; 164 p = td->td_proc; 165#ifdef KTRACE 166 if (KTRPOINT(td, KTR_CSW)) 167 ktrcsw(1, 0, wmesg); 168#endif --- 464 unchanged lines hidden --- | 162 WITNESS_SAVE_DECL(lock_witness); 163 164 td = curthread; 165 p = td->td_proc; 166#ifdef KTRACE 167 if (KTRPOINT(td, KTR_CSW)) 168 ktrcsw(1, 0, wmesg); 169#endif --- 464 unchanged lines hidden --- |