From fe8319b37865fe9e8fccfdec069ccd72d2c7c6d6 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 7 Dec 2011 13:06:11 -0500
Subject: [PATCH] --- yaml --- r: 280210 b: refs/heads/master c:
 d10577a8d86a0c735488d66d32289a6d66bcfa20 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/fs/namespace.c             | 25 ++++++-------------------
 trunk/fs/proc/namespaces.c       |  1 -
 trunk/security/tomoyo/realpath.c |  1 +
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index ee99f75922aa..c86d7635c859 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be08d6d260b6e7eb346162a1081cdf5f94fda569
+refs/heads/master: d10577a8d86a0c735488d66d32289a6d66bcfa20
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
index d4016f911ef9..773435ca300d 100644
--- a/trunk/fs/namespace.c
+++ b/trunk/fs/namespace.c
@@ -9,30 +9,17 @@
  */
 
 #include <linux/syscalls.h>
-#include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/percpu.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/acct.h>
+#include <linux/export.h>
 #include <linux/capability.h>
-#include <linux/cpumask.h>
-#include <linux/module.h>
-#include <linux/sysfs.h>
-#include <linux/seq_file.h>
 #include <linux/mnt_namespace.h>
 #include <linux/namei.h>
-#include <linux/nsproxy.h>
 #include <linux/security.h>
-#include <linux/mount.h>
-#include <linux/ramfs.h>
-#include <linux/log2.h>
 #include <linux/idr.h>
-#include <linux/fs_struct.h>
-#include <linux/fsnotify.h>
-#include <asm/uaccess.h>
-#include <asm/unistd.h>
+#include <linux/acct.h>		/* acct_auto_close_mnt */
+#include <linux/ramfs.h>	/* init_rootfs */
+#include <linux/fs_struct.h>	/* get_fs_root et.al. */
+#include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */
+#include <linux/uaccess.h>
 #include "pnode.h"
 #include "internal.h"
 
diff --git a/trunk/fs/proc/namespaces.c b/trunk/fs/proc/namespaces.c
index be177f702acb..27da860115c6 100644
--- a/trunk/fs/proc/namespaces.c
+++ b/trunk/fs/proc/namespaces.c
@@ -9,7 +9,6 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <net/net_namespace.h>
-#include <linux/mnt_namespace.h>
 #include <linux/ipc_namespace.h>
 #include <linux/pid_namespace.h>
 #include "internal.h"
diff --git a/trunk/security/tomoyo/realpath.c b/trunk/security/tomoyo/realpath.c
index 2cb5db589c9d..80a09c37cac8 100644
--- a/trunk/security/tomoyo/realpath.c
+++ b/trunk/security/tomoyo/realpath.c
@@ -5,6 +5,7 @@
  */
 
 #include "common.h"
+#include <linux/magic.h>
 
 /**
  * tomoyo_encode2 - Encode binary string to ascii string.