From 079277174c0044d6c385f462f1705ea7f31b5495 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Fri, 25 Jul 2008 01:45:43 -0700
Subject: [PATCH] --- yaml --- r: 105805 b: refs/heads/master c:
 ba92a43dbaee339cf5915ef766d3d3ffbaaf103c h: refs/heads/master i:   105803:
 87c19804a2227c4657d258abb6afb5fafdfb5857 v: v3

---
 [refs]          | 2 +-
 trunk/fs/exec.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cdbf255a847b..5fa6c81187f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b4bc46052ea8cd7c370b67ca0b9c26586f1439a
+refs/heads/master: ba92a43dbaee339cf5915ef766d3d3ffbaaf103c
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 190ed1f92774..e41aef0fb351 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -25,19 +25,18 @@
 #include <linux/slab.h>
 #include <linux/file.h>
 #include <linux/fdtable.h>
-#include <linux/mman.h>
+#include <linux/mm.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
 #include <linux/smp_lock.h>
+#include <linux/swap.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/pagemap.h>
 #include <linux/highmem.h>
 #include <linux/spinlock.h>
 #include <linux/key.h>
 #include <linux/personality.h>
 #include <linux/binfmts.h>
-#include <linux/swap.h>
 #include <linux/utsname.h>
 #include <linux/pid_namespace.h>
 #include <linux/module.h>
@@ -47,7 +46,6 @@
 #include <linux/mount.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
-#include <linux/rmap.h>
 #include <linux/tsacct_kern.h>
 #include <linux/cn_proc.h>
 #include <linux/audit.h>