From 7beaaf5cd2391ef1f8159791b46dbeb83ab0c2fb Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Sun, 22 Oct 2006 11:52:19 +0000
Subject: Complete break-out of sys/sys/mac.h into
 sys/security/mac/mac_framework.h begun with a repo-copy of mac.h to
 mac_framework.h.  sys/mac.h now contains the userspace and user<->kernel API
 and definitions, with all in-kernel interfaces moved to mac_framework.h,
 which is now included across most of the kernel instead.

This change is the first step in a larger cleanup and sweep of MAC
Framework interfaces in the kernel, and will not be MFC'd.

Obtained from:	TrustedBSD Project
Sponsored by:	SPARTA
---
 sys/fs/devfs/devfs_devs.c  | 3 ++-
 sys/fs/devfs/devfs_vnops.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'sys/fs/devfs')

diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 96c4798..8e155b8 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -37,7 +37,6 @@
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/sx.h>
@@ -49,6 +48,8 @@
 #include <fs/devfs/devfs.h>
 #include <fs/devfs/devfs_int.h>
 
+#include <security/mac/mac_framework.h>
+
 /*
  * The one true (but secret) list of active devices in the system.
  * Locked by dev_lock()/devmtx
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index b17eb4d..6ae4467 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -52,7 +52,6 @@
 #include <sys/filio.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mac.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
@@ -71,6 +70,8 @@ static struct fileops devfs_ops_f;
 #include <fs/devfs/devfs.h>
 #include <fs/devfs/devfs_int.h>
 
+#include <security/mac/mac_framework.h>
+
 struct mtx	devfs_de_interlock;
 MTX_SYSINIT(devfs_de_interlock, &devfs_de_interlock, "devfs interlock", MTX_DEF);
 
-- 
cgit v1.1