[PATCH] x86 setup.c: cleanup includes

[PATCH] x86 setup.c: cleanup includes

[Alexander Beregalov]

From: Alexander Beregalov <a.beregalov@gmail.com>

The patch applies to the linux-next tree.


x86: remove double includes in setup.c

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 3c98693..f4c9b58 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -57,12 +57,8 @@
 #include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/delay.h>
-#include <linux/highmem.h>

 #include <linux/kallsyms.h>
-#include <linux/edd.h>
-#include <linux/iscsi_ibft.h>
-#include <linux/kexec.h>
 #include <linux/cpufreq.h>
 #include <linux/dma-mapping.h>
 #include <linux/ctype.h>
@@ -104,7 +100,6 @@
 #include <asm/paravirt.h>

 #include <asm/percpu.h>
-#include <asm/sections.h>
 #include <asm/topology.h>
 #include <asm/apicdef.h>
 #ifdef CONFIG_X86_64

Re: [PATCH] x86 setup.c: cleanup includes

[Randy Dunlap]

On Sun, 6 Jul 2008 20:13:49 +0400 Alexander Beregalov wrote:

> From: Alexander Beregalov <a.beregalov@gmail.com>
> 
> The patch applies to the linux-next tree.
> 
> 
> x86: remove double includes in setup.c

Hi,

Did you do these manually (by personal inspection) or by some tool?
If a tool, what tool/where is it?  Thanks.

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

Re: [PATCH] x86 setup.c: cleanup includes

[Alexander Beregalov]

2008/7/6 Randy Dunlap <randy.dunlap@oracle.com>:
> Did you do these manually (by personal inspection) or by some tool?
> If a tool, what tool/where is it?  Thanks.

It is a simple script like this:

find . -name "*.h" -exec grep.sh {} \;
find . -name "*.c" -exec grep.sh {} \;

grep.sh:
#!/bin/sh
grep -H "^#include" $1|sed "s,/\*.\+,,"|grep -v ":$"|sort|uniq -c|grep
-v "^ \+1:"

I have found about 70-80 double inclusions, but most of them have
reason for that and can not be removed.

Re: [PATCH] x86 setup.c: cleanup includes

[Ingo Molnar]

* Alexander Beregalov <a.beregalov@gmail.com> wrote:

> From: Alexander Beregalov <a.beregalov@gmail.com>
> 
> The patch applies to the linux-next tree.
> 
> x86: remove double includes in setup.c

applied to tip/x86/cleanups - thanks Alexander.

	Ingo