From f34f362ad7e01a769e154cc4053b6c9b9f07998f Mon Sep 17 00:00:00 2001
From: Damien Zammit <damien@zamaudio.com>
Date: Mon, 6 Mar 2023 07:05:19 +0000
Subject: kern: Fix MACH_LOCK_MON lock monitoring debug
TESTED:
- by setting MACH_LOCK_MON to 1 in configfrag.ac
and running "show all slocks" in kdb
- does not break default configured kernel
Message-Id: <20230306070512.292715-1-damien@zamaudio.com>
---
kern/lock_mon.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'kern/lock_mon.c')
diff --git a/kern/lock_mon.c b/kern/lock_mon.c
index a963ec05..bb446b7a 100644
--- a/kern/lock_mon.c
+++ b/kern/lock_mon.c
@@ -45,7 +45,8 @@
#include <mach/boolean.h>
#include <kern/thread.h>
#include <kern/lock.h>
-
+#include <machine/ipl.h>
+#include <ddb/db_sym.h>
def_simple_lock_data(extern , kdb_lock)
def_simple_lock_data(extern , printf_lock)
@@ -93,7 +94,6 @@ decl_simple_lock_data(, **lock)
{
struct lock_info *li = &(lock_info[HASH_LOCK(*lock)].info[0]);
int i;
- my_cpu = cpu_number();
for (i=0; i < LOCK_INFO_PER_BUCKET; i++, li++)
if (li->lock) {
@@ -114,7 +114,7 @@ void simple_lock(lock)
decl_simple_lock_data(, *lock)
{
struct lock_info *li = locate_lock_info(&lock);
- my_cpu = cpu_number();
+ int my_cpu = cpu_number();
if (current_thread())
li->stack = current_thread()->lock_stack++;
@@ -133,7 +133,7 @@ int simple_lock_try(lock)
decl_simple_lock_data(, *lock)
{
struct lock_info *li = locate_lock_info(&lock);
- my_cpu = cpu_number();
+ int my_cpu = cpu_number();
if (curr_ipl[my_cpu])
li->masked++;
--
cgit v1.2.3