Re-apply rev 1.111:

Always include kernel_lock so that LOCKDEBUG checks can find the symbol.
This commit is contained in:
ad 2007-06-18 21:37:32 +00:00
parent 220b6d3811
commit b2138a8b6a
1 changed files with 5 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_lock.c,v 1.115 2007/06/15 20:59:38 ad Exp $ */
/* $NetBSD: kern_lock.c,v 1.116 2007/06/18 21:37:32 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2006, 2007 The NetBSD Foundation, Inc.
@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.115 2007/06/15 20:59:38 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.116 2007/06/18 21:37:32 ad Exp $");
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
@ -118,11 +118,6 @@ int lock_debug_syslog = 0; /* defaults to printf, but can be patched */
#endif
#endif /* defined(LOCKDEBUG) */
#if defined(MULTIPROCESSOR)
int kernel_lock_id;
__cpu_simple_lock_t kernel_lock;
#endif
/*
* Locking primitives implementation.
* Locks provide shared/exclusive synchronization.
@ -1468,6 +1463,9 @@ assert_sleepable(struct simplelock *interlock, const char *msg)
#endif /* LOCKDEBUG */ /* } */
int kernel_lock_id;
__cpu_simple_lock_t kernel_lock;
#if defined(MULTIPROCESSOR)
/*