2008-12-31 12:07:19

by Jaswinder Singh Rajput

Subject: [PATCH] x86: nmi.c fix style problems

Impact: cleanup, fix style problems

Fixes style problems:
WARNING: Use #include <linux/smp.h> instead of <asm/smp.h>
WARNING: Use #include <linux/nmi.h> instead of <asm/nmi.h>

total: 0 errors, 2 warnings

Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
arch/x86/kernel/nmi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 8bd1bf9..45a09cc 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -26,11 +26,10 @@
#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>
-#include <asm/smp.h>
-#include <asm/nmi.h>
#include <asm/proto.h>
#include <asm/timer.h>

--
1.5.5.1

2009-01-02 17:24:58

by Ingo Molnar

Subject: Re: [PATCH] x86: nmi.c fix style problems

* Jaswinder Singh Rajput <[email protected]> wrote:

> Impact: cleanup, fix style problems
>
> Fixes style problems:
> WARNING: Use #include <linux/smp.h> instead of <asm/smp.h>
> WARNING: Use #include <linux/nmi.h> instead of <asm/nmi.h>
>
> total: 0 errors, 2 warnings
>
> Signed-off-by: Jaswinder Singh Rajput <[email protected]>
> ---
> arch/x86/kernel/nmi.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
> index 8bd1bf9..45a09cc 100644
> --- a/arch/x86/kernel/nmi.c
> +++ b/arch/x86/kernel/nmi.c
> @@ -26,11 +26,10 @@
> #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>
> -#include <asm/smp.h>
> -#include <asm/nmi.h>
> #include <asm/proto.h>
> #include <asm/timer.h>

does this build fine on UP + IOAPIC ? asm/smp.h has some side-effects that
brings in certain APIC definitions.

Ingo

2009-01-02 17:55:50

by Jaswinder Singh Rajput

Subject: Re: [PATCH] x86: nmi.c fix style problems

On Fri, 2009-01-02 at 18:24 +0100, Ingo Molnar wrote:
> does this build fine on UP + IOAPIC ? asm/smp.h has some side-effects that
> brings in certain APIC definitions.
>

Yes, it works fine for me.

JSR