[RFC, 2.6.26.2-rc1] exec: remove some includes

[RFC, 2.6.26.2-rc1] exec: remove some includes

[Oliver Pinter]

>From ba92a43dbaee339cf5915ef766d3d3ffbaaf103c Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Fri, 25 Jul 2008 01:45:43 -0700
Subject: [PATCH] exec: remove some includes

[ Upstream commit ba92a43dbaee339cf5915ef766d3d3ffbaaf103c ]

fs/exec.c used to need mman.h pagemap.h swap.h and rmap.h when it did
mm-ish stuff in install_arg_page(); but no need for them after 2.6.22.

[akpm@linux-foundation.org: unbreak arm]
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
CC: Oliver Pinter <oliver.pntr@gmail.com>

diff --git a/fs/exec.c b/fs/exec.c
index 190ed1f..e41aef0 100644
--- a/fs/exec.c
+++ b/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>

Re: [RFC, 2.6.26.2-rc1] exec: remove some includes

[Linus Torvalds]

On Sat, 2 Aug 2008, Oliver Pinter wrote:
> 
> [ Upstream commit ba92a43dbaee339cf5915ef766d3d3ffbaaf103c ]
> 
> fs/exec.c used to need mman.h pagemap.h swap.h and rmap.h when it did
> mm-ish stuff in install_arg_page(); but no need for them after 2.6.22.

Why on earth would this be -stable material?

		Linus

Re: [RFC, 2.6.26.2-rc1] exec: remove some includes

[Hugh Dickins]

On Sat, 2 Aug 2008, Linus Torvalds wrote:
> On Sat, 2 Aug 2008, Oliver Pinter wrote:
> > 
> > [ Upstream commit ba92a43dbaee339cf5915ef766d3d3ffbaaf103c ]
> > 
> > fs/exec.c used to need mman.h pagemap.h swap.h and rmap.h when it did
> > mm-ish stuff in install_arg_page(); but no need for them after 2.6.22.
> 
> Why on earth would this be -stable material?

Of course it isn't -stable material, I don't know what Oliver's on.

Maybe he noticed akpm's "unbreak arm" comment and thought it was
fixing some pre-existing breakage: no, akpm restored swap.h to
fix the arm build.  Then after this commit, we had to restore
pagemap.h to fix avr32 and !CONFIG_SWAP builds.

Prime material for -unstable, I'm ashamed to say.

Hugh

Re: [RFC, 2.6.26.2-rc1] exec: remove some includes

[Willy Tarreau]

On Sat, Aug 02, 2008 at 09:45:17PM +0200, Oliver Pinter wrote:
> >From ba92a43dbaee339cf5915ef766d3d3ffbaaf103c Mon Sep 17 00:00:00 2001
> From: Hugh Dickins <hugh@veritas.com>
> Date: Fri, 25 Jul 2008 01:45:43 -0700
> Subject: [PATCH] exec: remove some includes
> 
> [ Upstream commit ba92a43dbaee339cf5915ef766d3d3ffbaaf103c ]
> 
> fs/exec.c used to need mman.h pagemap.h swap.h and rmap.h when it did
> mm-ish stuff in install_arg_page(); but no need for them after 2.6.22.
                                          ^^^^^^^
Oliver, this patch apparently fixes nothing, and playing with includes
always causes a risk of regression. Please ensure that only fixes for
real problems are submitted to stable and check stable_kernel_rules.txt
when in doubt.

Willy

Re: [RFC, 2.6.26.2-rc1] exec: remove some includes

[Oliver Pinter]

I understood, I do not send patches with a character like this in the
future then, but I send it because of this in RFC

On 8/2/08, Willy Tarreau <w@1wt.eu> wrote:
> On Sat, Aug 02, 2008 at 09:45:17PM +0200, Oliver Pinter wrote:
>> >From ba92a43dbaee339cf5915ef766d3d3ffbaaf103c Mon Sep 17 00:00:00 2001
>> From: Hugh Dickins <hugh@veritas.com>
>> Date: Fri, 25 Jul 2008 01:45:43 -0700
>> Subject: [PATCH] exec: remove some includes
>>
>> [ Upstream commit ba92a43dbaee339cf5915ef766d3d3ffbaaf103c ]
>>
>> fs/exec.c used to need mman.h pagemap.h swap.h and rmap.h when it did
>> mm-ish stuff in install_arg_page(); but no need for them after 2.6.22.
>                                           ^^^^^^^
> Oliver, this patch apparently fixes nothing, and playing with includes
> always causes a risk of regression. Please ensure that only fixes for
> real problems are submitted to stable and check stable_kernel_rules.txt
> when in doubt.
>
> Willy
>
>


-- 
Thanks,
Oliver