Impact: cleanup, avoid sparse warning
Include "../pci/pci.h" for port_cf9_safe
Fixes this sparse warning:
arch/x86/kernel/reboot.c:43:6: warning: symbol 'port_cf9_safe' was not declared. Should it be static?
Signed-off-by: Jaswinder Singh <[email protected]>
---
arch/x86/kernel/reboot.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index ba7b9a0..f39e871 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -22,6 +22,7 @@
#endif
#include <mach_ipi.h>
+#include "../pci/pci.h"
/*
--
1.5.5.1
* Jaswinder Singh <[email protected]> wrote:
> Impact: cleanup, avoid sparse warning
>
> Include "../pci/pci.h" for port_cf9_safe
>
> Fixes this sparse warning:
> arch/x86/kernel/reboot.c:43:6: warning: symbol 'port_cf9_safe' was not declared. Should it be static?
>
> Signed-off-by: Jaswinder Singh <[email protected]>
> ---
> arch/x86/kernel/reboot.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
applied to tip/x86/cleanups, thanks!
btw., this is ugly now:
> --- a/arch/x86/kernel/reboot.c
> +++ b/arch/x86/kernel/reboot.c
> @@ -22,6 +22,7 @@
> #endif
>
> #include <mach_ipi.h>
> +#include "../pci/pci.h"
could you send another patch that moves arch/x86/pci/pci.h to
arch/x86/include/asm/pci_x86.h (and update all the pci.h include sites)?
Ingo
Hello Ingo,
On Sat, Dec 27, 2008 at 4:01 PM, Ingo Molnar <[email protected]> wrote:
>
>>
>> #include <mach_ipi.h>
>> +#include "../pci/pci.h"
>
> could you send another patch that moves arch/x86/pci/pci.h to
> arch/x86/include/asm/pci_x86.h (and update all the pci.h include sites)?
>
Sure, I will send this patch today.
Thank you,
Jaswinder Singh Rajput.
Hello Ingo,
On Sat, 2008-12-27 at 11:31 +0100, Ingo Molnar wrote:
> btw., this is ugly now:
>
> > --- a/arch/x86/kernel/reboot.c
> > +++ b/arch/x86/kernel/reboot.c
> > @@ -22,6 +22,7 @@
> > #endif
> >
> > #include <mach_ipi.h>
> > +#include "../pci/pci.h"
>
> could you send another patch that moves arch/x86/pci/pci.h to
> arch/x86/include/asm/pci_x86.h (and update all the pci.h include sites)?
>
1. I send [PATCH] move arch/x86/pci/pci.h to
arch/x86/include/asm/pci_x86.h but I forget to write x86: before this
patch.
Please let me know which one is better option :
[PATCH]x86: move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h
OR
[PATCH -tip]x86: move arch/x86/pci/pci.h to
arch/x86/include/asm/pci_x86.h
OR some other name.
2. I also did not write any reason of patch this may lead confusion to
other developers, can you please provide some good reasons for this
patch.
3. I also did some cleanups in arch/x86/include/asm/pci_x86.h raised
by ./scripts/checkpatch.pl, is this OK.
4. Can I resend above patch by solving above issues.
Thank you,
JSR
* Jaswinder Singh Rajput <[email protected]> wrote:
> Hello Ingo,
>
> On Sat, 2008-12-27 at 11:31 +0100, Ingo Molnar wrote:
>
> > btw., this is ugly now:
> >
> > > --- a/arch/x86/kernel/reboot.c
> > > +++ b/arch/x86/kernel/reboot.c
> > > @@ -22,6 +22,7 @@
> > > #endif
> > >
> > > #include <mach_ipi.h>
> > > +#include "../pci/pci.h"
> >
> > could you send another patch that moves arch/x86/pci/pci.h to
> > arch/x86/include/asm/pci_x86.h (and update all the pci.h include sites)?
> >
>
> 1. I send [PATCH] move arch/x86/pci/pci.h to
> arch/x86/include/asm/pci_x86.h but I forget to write x86: before this
> patch.
no, your patch is fine. I routinely fix up commit logs.
Jesse, is it fine to you if we push this via the x86 tree? A couple of
usage sites of arch/x86/pci/pci.h arose that use ../pci/pci.h kind of ugly
#include prefixes, which justifies moving the file to
arch/x86/include/asm. No change in behavior.
Ingo
On Monday, December 29, 2008 3:08 am Ingo Molnar wrote:
> * Jaswinder Singh Rajput <[email protected]> wrote:
> > Hello Ingo,
> >
> > On Sat, 2008-12-27 at 11:31 +0100, Ingo Molnar wrote:
> > > btw., this is ugly now:
> > > > --- a/arch/x86/kernel/reboot.c
> > > > +++ b/arch/x86/kernel/reboot.c
> > > > @@ -22,6 +22,7 @@
> > > > #endif
> > > >
> > > > #include <mach_ipi.h>
> > > > +#include "../pci/pci.h"
> > >
> > > could you send another patch that moves arch/x86/pci/pci.h to
> > > arch/x86/include/asm/pci_x86.h (and update all the pci.h include
> > > sites)?
> >
> > 1. I send [PATCH] move arch/x86/pci/pci.h to
> > arch/x86/include/asm/pci_x86.h but I forget to write x86: before this
> > patch.
>
> no, your patch is fine. I routinely fix up commit logs.
>
> Jesse, is it fine to you if we push this via the x86 tree? A couple of
> usage sites of arch/x86/pci/pci.h arose that use ../pci/pci.h kind of ugly
> #include prefixes, which justifies moving the file to
> arch/x86/include/asm. No change in behavior.
Yeah, that's fine. Best to get it over with... I'll take care of any
conflicts in my tree when I prepare my merge.
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
* Jesse Barnes <[email protected]> wrote:
> > Jesse, is it fine to you if we push this via the x86 tree? A couple of
> > usage sites of arch/x86/pci/pci.h arose that use ../pci/pci.h kind of
> > ugly
> > #include prefixes, which justifies moving the file to
> > arch/x86/include/asm. No change in behavior.
>
> Yeah, that's fine. Best to get it over with... I'll take care of any
> conflicts in my tree when I prepare my merge.
thanks - i've added your ack. Should go Linus-wards within the next few
days.
Ingo