From 3d62aac2110b550ddd179d0f5d631246a5756828 Mon Sep 17 00:00:00 2001
From: Venkatesh Srinivas <me@endeavour.zapto.org>
Date: Tue, 15 Mar 2011 17:52:57 -0700
Subject: [PATCH] kernel -- Remove mplock2.h header from files not using the
 mplock.

---
 sys/kern/imgact_resident.c | 1 -
 sys/kern/kern_clock.c      | 1 -
 sys/kern/kern_kthread.c    | 2 --
 sys/kern/kern_synch.c      | 1 -
 sys/kern/vfs_lock.c        | 1 -
 5 files changed, 6 deletions(-)

diff --git a/sys/kern/imgact_resident.c b/sys/kern/imgact_resident.c
index 512cd80a0b..e9297fbb27 100644
--- a/sys/kern/imgact_resident.c
+++ b/sys/kern/imgact_resident.c
@@ -64,7 +64,6 @@
 #include <vm/vm_extern.h>
 
 #include <sys/sysref2.h>
-#include <sys/mplock2.h>
 
 static int exec_res_id = 0;
 
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index a26c450e02..5a26a54909 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -97,7 +97,6 @@
 #include <sys/sysctl.h>
 
 #include <sys/thread2.h>
-#include <sys/mplock2.h>
 
 #include <machine/cpu.h>
 #include <machine/limits.h>
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index a9cacfe460..3f731b6af2 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -37,8 +37,6 @@
 #include <sys/unistd.h>
 #include <sys/wait.h>
 
-#include <sys/mplock2.h>
-
 #include <machine/stdarg.h>
 
 static struct lwkt_token kpsus_token = LWKT_TOKEN_INITIALIZER(kpsus_token);
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index de6ff755ba..65303ca0dd 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -63,7 +63,6 @@
 #include <sys/thread2.h>
 #include <sys/spinlock2.h>
 #include <sys/mutex2.h>
-#include <sys/mplock2.h>
 
 #include <machine/cpu.h>
 #include <machine/smp.h>
diff --git a/sys/kern/vfs_lock.c b/sys/kern/vfs_lock.c
index 2a96f9c6f2..e0829d452c 100644
--- a/sys/kern/vfs_lock.c
+++ b/sys/kern/vfs_lock.c
@@ -57,7 +57,6 @@
 #include <sys/buf2.h>
 #include <sys/thread2.h>
 #include <sys/sysref2.h>
-#include <sys/mplock2.h>
 
 static void vnode_terminate(struct vnode *vp);
 static boolean_t vnode_ctor(void *obj, void *private, int ocflags);
-- 
2.41.0