From 1d58775d99010490e8a8ef9480c384fa2037aa1c Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Mon, 10 Jan 2011 08:17:10 +0200
Subject: [PATCH] --- yaml --- r: 227703 b: refs/heads/master c:
 37721e1b0cf98cb65895f234d8c500d270546529 h: refs/heads/master i:   227701:
 fca6194fdd8a58b4ea3082afef1e5301e9486fe0   227699:
 4656abd72443281ea7a93e0fbe91c32797ff3681   227695:
 b89f0072e4bf1e7168ec85babe18f4dc752d8e59 v: v3

---
 [refs]                                 | 2 +-
 trunk/include/linux/audit.h            | 1 +
 trunk/include/linux/dcookies.h         | 2 +-
 trunk/include/linux/sched.h            | 1 -
 trunk/security/apparmor/include/file.h | 3 +--
 trunk/security/selinux/include/avc.h   | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 74d9e9617399..54639467516d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f99a2f0e44663517b99b69a3e4a499d0ba877df
+refs/heads/master: 37721e1b0cf98cb65895f234d8c500d270546529
diff --git a/trunk/include/linux/audit.h b/trunk/include/linux/audit.h
index 8b5c0620abf9..359df0487690 100644
--- a/trunk/include/linux/audit.h
+++ b/trunk/include/linux/audit.h
@@ -372,6 +372,7 @@ struct audit_buffer;
 struct audit_context;
 struct inode;
 struct netlink_skb_parms;
+struct path;
 struct linux_binprm;
 struct mq_attr;
 struct mqstat;
diff --git a/trunk/include/linux/dcookies.h b/trunk/include/linux/dcookies.h
index 24c806f12a6c..5ac3bdd5cee6 100644
--- a/trunk/include/linux/dcookies.h
+++ b/trunk/include/linux/dcookies.h
@@ -13,10 +13,10 @@
 #ifdef CONFIG_PROFILING
  
 #include <linux/dcache.h>
-#include <linux/path.h>
 #include <linux/types.h>
  
 struct dcookie_user;
+struct path;
  
 /**
  * dcookie_register - register a user of dcookies
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 341acbbc434a..c118a7f203aa 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -70,7 +70,6 @@ struct sched_param {
 #include <linux/smp.h>
 #include <linux/sem.h>
 #include <linux/signal.h>
-#include <linux/path.h>
 #include <linux/compiler.h>
 #include <linux/completion.h>
 #include <linux/pid.h>
diff --git a/trunk/security/apparmor/include/file.h b/trunk/security/apparmor/include/file.h
index be36feabb16a..ab8c6d87f758 100644
--- a/trunk/security/apparmor/include/file.h
+++ b/trunk/security/apparmor/include/file.h
@@ -15,12 +15,11 @@
 #ifndef __AA_FILE_H
 #define __AA_FILE_H
 
-#include <linux/path.h>
-
 #include "domain.h"
 #include "match.h"
 
 struct aa_profile;
+struct path;
 
 /*
  * We use MAY_EXEC, MAY_WRITE, MAY_READ, MAY_APPEND and the following flags
diff --git a/trunk/security/selinux/include/avc.h b/trunk/security/selinux/include/avc.h
index e94e82f73818..5615081b73ec 100644
--- a/trunk/security/selinux/include/avc.h
+++ b/trunk/security/selinux/include/avc.h
@@ -15,7 +15,6 @@
 #include <linux/audit.h>
 #include <linux/lsm_audit.h>
 #include <linux/in6.h>
-#include <linux/path.h>
 #include <asm/system.h>
 #include "flask.h"
 #include "av_permissions.h"