2009-01-05 22:58:52

by Huang Weiyi

Subject: x86: remove duplicated #include's

Removed duplicated #include's in
arch/x86/kernel/mpparse.c
arch/x86/kernel/nmi.c

Signed-off-by: Huang Weiyi <[email protected]>

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index c5c5b8d..76ee713 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -17,7 +17,6 @@
#include <linux/acpi.h>
#include <linux/module.h>
#include <linux/smp.h>
-#include <linux/acpi.h>

#include <asm/mtrr.h>
#include <asm/mpspec.h>
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 45a09cc..7228979 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -26,7 +26,6 @@
#include <linux/kernel_stat.h>
#include <linux/kdebug.h>
#include <linux/smp.h>
-#include <linux/nmi.h>

#include <asm/i8259.h>
#include <asm/io_apic.h>

2009-01-06 05:44:36

by Jaswinder Singh

Subject: Re: x86: remove duplicated #include's

On Tue, Jan 6, 2009 at 4:28 AM, Huang Weiyi <[email protected]> wrote:
> Removed duplicated #include's in
> arch/x86/kernel/mpparse.c
> arch/x86/kernel/nmi.c
>
> Signed-off-by: Huang Weiyi <[email protected]>
>
> diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
> index c5c5b8d..76ee713 100644
> --- a/arch/x86/kernel/mpparse.c
> +++ b/arch/x86/kernel/mpparse.c
> @@ -17,7 +17,6 @@
> #include <linux/acpi.h>
> #include <linux/module.h>
> #include <linux/smp.h>
> -#include <linux/acpi.h>
>
> #include <asm/mtrr.h>
> #include <asm/mpspec.h>
> diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
> index 45a09cc..7228979 100644
> --- a/arch/x86/kernel/nmi.c
> +++ b/arch/x86/kernel/nmi.c
> @@ -26,7 +26,6 @@
> #include <linux/kernel_stat.h>
> #include <linux/kdebug.h>
> #include <linux/smp.h>
> -#include <linux/nmi.h>
>
> #include <asm/i8259.h>
> #include <asm/io_apic.h>
>

Thanks Huang Weiyi.
--
JSR

2009-01-06 12:35:01

by Ingo Molnar

Subject: Re: x86: remove duplicated #include's

* Huang Weiyi <[email protected]> wrote:

> Removed duplicated #include's in
> arch/x86/kernel/mpparse.c
> arch/x86/kernel/nmi.c
>
> Signed-off-by: Huang Weiyi <[email protected]>

applied to tip/x86/cleanups, thanks,

Ingo