Deleted Added
full compact
kern_lock.c (217265) kern_lock.c (219028)
1/*-
2 * Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGE.
27 */
28
29#include "opt_adaptive_lockmgrs.h"
30#include "opt_ddb.h"
31#include "opt_kdtrace.h"
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008 Attilio Rao <attilio@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGE.
27 */
28
29#include "opt_adaptive_lockmgrs.h"
30#include "opt_ddb.h"
31#include "opt_kdtrace.h"
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/kern/kern_lock.c 217265 2011-01-11 13:59:06Z jhb $");
34__FBSDID("$FreeBSD: head/sys/kern/kern_lock.c 219028 2011-02-25 10:11:01Z netchild $");
35
36#include <sys/param.h>
37#include <sys/ktr.h>
38#include <sys/lock.h>
39#include <sys/lock_profile.h>
40#include <sys/lockmgr.h>
41#include <sys/mutex.h>
42#include <sys/proc.h>

--- 1251 unchanged lines hidden (view full) ---

1294 ret = LK_EXCLOTHER;
1295 } else if (x == LK_UNLOCKED)
1296 ret = 0;
1297
1298 return (ret);
1299}
1300
1301#ifdef INVARIANT_SUPPORT
35
36#include <sys/param.h>
37#include <sys/ktr.h>
38#include <sys/lock.h>
39#include <sys/lock_profile.h>
40#include <sys/lockmgr.h>
41#include <sys/mutex.h>
42#include <sys/proc.h>

--- 1251 unchanged lines hidden (view full) ---

1294 ret = LK_EXCLOTHER;
1295 } else if (x == LK_UNLOCKED)
1296 ret = 0;
1297
1298 return (ret);
1299}
1300
1301#ifdef INVARIANT_SUPPORT
1302
1303FEATURE(invariant_support,
1304 "Support for modules compiled with INVARIANTS option");
1305
1302#ifndef INVARIANTS
1303#undef _lockmgr_assert
1304#endif
1305
1306void
1307_lockmgr_assert(struct lock *lk, int what, const char *file, int line)
1308{
1309 int slocked = 0;

--- 134 unchanged lines hidden ---
1306#ifndef INVARIANTS
1307#undef _lockmgr_assert
1308#endif
1309
1310void
1311_lockmgr_assert(struct lock *lk, int what, const char *file, int line)
1312{
1313 int slocked = 0;

--- 134 unchanged lines hidden ---