Skip to contentSkip to conversation

exec: remove some includes

RFC In review Oliver Pinter 4 participants 5 messages Aug 2, 2008

Subsystems (2)
VFS exec and binfmt
lore
Share & tools
lore

Oliver Pinter

author
#0 lore raw

RFC 1/1 exec: remove some includes

Quoted 1 line

From ba92a43dbaee339cf5915ef766d3d3ffbaaf103c Mon Sep 17 00:00:00 2001

From: Hugh Dickins <[email protected]>
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.

[[email protected]: unbreak arm]
Signed-off-by Hugh Dickins <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Linus Torvalds <[email protected]>
CC Oliver Pinter <[email protected]>
fs/exec.c +2 -4
index 190ed1f..e41aef0 100644
@@ -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>
#1 lore raw
Quoted 5 lines · Oliver Pinter

[ 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

#2 lore raw
Quoted 8 lines · Linus Torvalds
Quoted 5 lines · Oliver Pinter

[ 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

#3 lore raw
In reply to Oliver Pinter
Quoted 9 lines · Oliver Pinter
Quoted 1 line

From ba92a43dbaee339cf5915ef766d3d3ffbaaf103c Mon Sep 17 00:00:00 2001

From: Hugh Dickins <[email protected]>
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

author
#4 lore raw

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

Quoted 19 lines · Willy Tarreau
Quoted 9 lines · Oliver Pinter
Quoted 1 line

From ba92a43dbaee339cf5915ef766d3d3ffbaaf103c Mon Sep 17 00:00:00 2001

From: Hugh Dickins <[email protected]>
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

Signature · 2 lines
Thanks,
Oliver