Skip to contentSkip to conversation

x86: reboot.c declare port_cf9_safe before they get used

PATCH Applied Jaswinder Singh 4 participants 7 messages Dec 23, 2008 – Dec 29, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: reboot.c declare port_cf9_safe before they get used

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?

---
 arch/x86/kernel/reboot.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/x86/kernel/reboot.c +1 -0
index ba7b9a0..f39e871 100644
@@ -22,6 +22,7 @@
 #endif
 
 #include <mach_ipi.h>
+#include "../pci/pci.h"
 
 
 /*
Signature · 1 line
1.5.5.1
Applied
#1 lore raw
Quoted 11 lines · Jaswinder Singh

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?

---
 arch/x86/kernel/reboot.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applied to tip/x86/cleanups, thanks!

btw., this is ugly now:

arch/x86/kernel/reboot.c line 25

Quoted 7 lines
arch/x86/kernel/reboot.c +1 -0
@@ -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

#2 lore raw

Hello Ingo,

Quoted 8 lines · Ingo Molnar
Quoted 4 lines

#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.

#3 lore raw
In reply to Ingo Molnar

Hello Ingo,

Quoted 7 lines · Ingo Molnar

btw., this is ugly now:

Quoted 5 lines
arch/x86/kernel/reboot.c +0 -0
@@ -22,6 +22,7 @@
 #endif
 
Quoted 6 lines

arch/x86/kernel/reboot.c line 25

Quoted 2 lines
arch/x86/kernel/reboot.c +1 -0
 #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

#4 lore raw
Quoted 18 lines · Jaswinder Singh Rajput

Hello Ingo,

Quoted 7 lines · Ingo Molnar

btw., this is ugly now:

Quoted 5 lines
arch/x86/kernel/reboot.c +0 -0
@@ -22,6 +22,7 @@
 #endif
 
Quoted 6 lines

arch/x86/kernel/reboot.c line 25

Quoted 2 lines
arch/x86/kernel/reboot.c +1 -0
 #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)?

Quoted 3 lines

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

#5 lore raw
Quoted 21 lines · Ingo Molnar
Quoted 16 lines · Jaswinder Singh Rajput

Hello Ingo,

Quoted 6 lines · Ingo Molnar

btw., this is ugly now:

Quoted 5 lines
arch/x86/kernel/reboot.c +0 -0
@@ -22,6 +22,7 @@
 #endif
 
Quoted 6 lines

arch/x86/kernel/reboot.c line 25

Quoted 2 lines
arch/x86/kernel/reboot.c +1 -0
 #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)?

Quoted 3 lines

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.

Quoted 6 lines

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,

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#6 lore raw
Quoted 8 lines · Jesse Barnes
Quoted 5 lines

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