ix86: fix build failure when !CONFIG_X86_IO_APIC
PATCH 1/1 ix86: fix build failure when !CONFIG_X86_IO_APIC
mp_should_keep_irq() isn't really IO-APIC related, and considering that it's being used solely in arch/x86/pci/ likely both declaration and definition got misplaced even without considering the resulting build failure:
.../arch/x86/pci/irq.c: In function ‘pirq_disable_irq’:.../arch/x86/pci/irq.c:1259: error: implicit declaration of function ‘mp_should_keep_irq’ make[3]: *** [arch/x86/pci/irq.o] Error 1
Move them to better places.
--- arch/x86/include/asm/io_apic.h | 2 -- arch/x86/include/asm/pci_x86.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 12 ------------ arch/x86/pci/irq.c | 12 ++++++++++++ 4 files changed, 14 insertions(+), 14 deletions(-)
arch/x86/include/asm/io_apic.h +0 -2
@@ -227,8 +227,6 @@ static inline void io_apic_modify(unsignextern void io_apic_eoi (unsigned int apic,unsigned int vector); -extern bool mp_should_keep_irq (struct device *dev); -#else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0
arch/x86/include/asm/pci_x86.h +2 -0
@@ -93,6 +93,8 @@ extern raw_spinlock_t pci_config_lock;extern int (*pcibios_enable_irq)(struct pci_dev *dev);extern void (*pcibios_disable_irq)(struct pci_dev *dev); +extern bool mp_should_keep_irq (struct device *dev); +struct pci_raw_ops {int (*read)(unsigned int domain,unsigned int bus,unsigned int devfn,int reg,int len,u32 *val);
arch/x86/kernel/apic/io_apic.c +0 -12
@@ -3959,18 +3959,6 @@ int mp_set_gsi_attr(u32 gsi, int triggerreturn ret; } -bool mp_should_keep_irq (struct device *dev) -{ -if (dev->power.is_prepared) -return true; -#ifdef CONFIG_PM_RUNTIME -if (dev->power.runtime_status ==RPM_SUSPENDING ) -return true; -#endif - -return false; -} -/* Enable IOAPIC early just for system timer */ void __init pre_init_apic_IRQ0 (void ) {
arch/x86/pci/irq.c +12 -0
@@ -1254,6 +1254,18 @@ static int pirq_enable_irq(struct pci_dereturn 0 ; } +bool mp_should_keep_irq (struct device *dev) +{ +if (dev->power.is_prepared) +return true; +#ifdef CONFIG_PM_RUNTIME +if (dev->power.runtime_status ==RPM_SUSPENDING ) +return true; +#endif + +return false; +} +static void pirq_disable_irq (struct pci_dev *dev) { if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&
tip-bot for Jan Beulich
merge bot[tip:x86/urgent] ix86: Fix build failure when !CONFIG_X86_IO_APIC
ix86: Fix build failure when !CONFIG_X86_IO_APIC
Commit-ID: de8bf1a32bd379a4f953c3146b82c8a438d7aa5d Gitweb: http://git.kernel.org/tip/de8bf1a32bd379a4f953c3146b82c8a438d7aa5d Author: Jan Beulich <[email protected]> AuthorDate: Tue, 16 Sep 2014 13:44:24 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 28 Oct 2014 11:06:16 +0100
ix86: Fix build failure when !CONFIG_X86_IO_APIC
mp_should_keep_irq() isn't really IO-APIC related, and considering that it's being used solely in arch/x86/pci/ likely both declaration and definition got misplaced even without considering the resulting build failure:
.../arch/x86/pci/irq.c: In function ‘pirq_disable_irq’:
.../arch/x86/pci/irq.c:1259: error: implicit declaration of function ‘mp_should_keep_irq’ make[3]: *** [arch/x86/pci/irq.o] Error 1
Move them to better places.
--- arch/x86/include/asm/io_apic.h | 2 -- arch/x86/include/asm/pci_x86.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 12 ------------ arch/x86/pci/irq.c | 12 ++++++++++++ 4 files changed, 14 insertions(+), 14 deletions(-)
arch/x86/include/asm/io_apic.h +0 -2
@@ -227,8 +227,6 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsignedextern void io_apic_eoi (unsigned int apic,unsigned int vector); -extern bool mp_should_keep_irq (struct device *dev); -#else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0
arch/x86/include/asm/pci_x86.h +2 -0
@@ -93,6 +93,8 @@ extern raw_spinlock_t pci_config_lock;extern int (*pcibios_enable_irq)(struct pci_dev *dev);extern void (*pcibios_disable_irq)(struct pci_dev *dev); +extern bool mp_should_keep_irq (struct device *dev); +struct pci_raw_ops {int (*read)(unsigned int domain,unsigned int bus,unsigned int devfn,int reg,int len,u32 *val);
arch/x86/kernel/apic/io_apic.c +0 -12
@@ -3964,18 +3964,6 @@ int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node)return ret; } -bool mp_should_keep_irq (struct device *dev) -{ -if (dev->power.is_prepared) -return true; -#ifdef CONFIG_PM_RUNTIME -if (dev->power.runtime_status ==RPM_SUSPENDING ) -return true; -#endif - -return false; -} -/* Enable IOAPIC early just for system timer */ void __init pre_init_apic_IRQ0 (void ) {
arch/x86/pci/irq.c +12 -0
@@ -1254,6 +1254,18 @@ static int pirq_enable_irq(struct pci_dev *dev)return 0 ; } +bool mp_should_keep_irq (struct device *dev) +{ +if (dev->power.is_prepared) +return true; +#ifdef CONFIG_PM_RUNTIME +if (dev->power.runtime_status ==RPM_SUSPENDING ) +return true; +#endif + +return false; +} +static void pirq_disable_irq (struct pci_dev *dev) { if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&
tip-bot for Jan Beulich
merge bot[tip:x86/urgent] ix86: Fix build failure when !CONFIG_X86_IO_APIC
In reply to Jan Beulichix86: Fix build failure when !CONFIG_X86_IO_APIC
Commit-ID: a425cf83e39f99a70168c184e79cea8c67ba7c12 Gitweb: http://git.kernel.org/tip/a425cf83e39f99a70168c184e79cea8c67ba7c12 Author: Jan Beulich <[email protected]> AuthorDate: Tue, 16 Sep 2014 13:44:24 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 28 Oct 2014 12:01:09 +0100
ix86: Fix build failure when !CONFIG_X86_IO_APIC
mp_should_keep_irq() isn't really IO-APIC related, and considering that it's being used solely in arch/x86/pci/ likely both declaration and definition got misplaced even without considering the resulting build failure:
.../arch/x86/pci/irq.c: In function ‘pirq_disable_irq’:
.../arch/x86/pci/irq.c:1259: error: implicit declaration of function ‘mp_should_keep_irq’ make[3]: *** [arch/x86/pci/irq.o] Error 1
Move them to better places.
--- arch/x86/include/asm/io_apic.h | 2 -- arch/x86/include/asm/pci_x86.h | 2 ++ arch/x86/kernel/apic/io_apic.c | 12 ------------ arch/x86/pci/irq.c | 12 ++++++++++++ 4 files changed, 14 insertions(+), 14 deletions(-)
arch/x86/include/asm/io_apic.h +0 -2
@@ -227,8 +227,6 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsignedextern void io_apic_eoi (unsigned int apic,unsigned int vector); -extern bool mp_should_keep_irq (struct device *dev); -#else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0
arch/x86/include/asm/pci_x86.h +2 -0
@@ -93,6 +93,8 @@ extern raw_spinlock_t pci_config_lock;extern int (*pcibios_enable_irq)(struct pci_dev *dev);extern void (*pcibios_disable_irq)(struct pci_dev *dev); +extern bool mp_should_keep_irq (struct device *dev); +struct pci_raw_ops {int (*read)(unsigned int domain,unsigned int bus,unsigned int devfn,int reg,int len,u32 *val);
arch/x86/kernel/apic/io_apic.c +0 -12
@@ -3964,18 +3964,6 @@ int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node)return ret; } -bool mp_should_keep_irq (struct device *dev) -{ -if (dev->power.is_prepared) -return true; -#ifdef CONFIG_PM_RUNTIME -if (dev->power.runtime_status ==RPM_SUSPENDING ) -return true; -#endif - -return false; -} -/* Enable IOAPIC early just for system timer */ void __init pre_init_apic_IRQ0 (void ) {
arch/x86/pci/irq.c +12 -0
@@ -1254,6 +1254,18 @@ static int pirq_enable_irq(struct pci_dev *dev)return 0 ; } +bool mp_should_keep_irq (struct device *dev) +{ +if (dev->power.is_prepared) +return true; +#ifdef CONFIG_PM_RUNTIME +if (dev->power.runtime_status ==RPM_SUSPENDING ) +return true; +#endif + +return false; +} +static void pirq_disable_irq (struct pci_dev *dev) { if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&
Re: [tip:x86/urgent] ix86: Fix build failure when !CONFIG_X86_IO_APIC
Quoted 15 lines
Quoted 1 line
Quoted 1 line · On 28.10.14 at 12:18, <[email protected]> wrote:
Commit-ID: a425cf83e39f99a70168c184e79cea8c67ba7c12 Gitweb: http://git.kernel.org/tip/a425cf83e39f99a70168c184e79cea8c67ba7c12 Author: Jan Beulich <[email protected]> AuthorDate: Tue, 16 Sep 2014 13:44:24 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 28 Oct 2014 12:01:09 +0100ix86: Fix build failure when !CONFIG_X86_IO_APIC
mp_should_keep_irq()isn't really IO-APIC related, and considering that it's being used solely inarch/x86/pci/likely both declaration and definition got misplaced even without considering the resulting build failure:
Quoted 6 lines
.../arch/x86/pci/irq.c: In function ‘pirq_disable_irq’:
.../arch/x86/pci/irq.c:1259: error: implicit declaration of function
‘mp_should_keep_irq’
make[3]: *** [arch/x86/pci/irq.o] Error 1Move them to better places.
Ingo,
the build failure had got addressed by a different patch already, albeit that patch seems far from ideal to me. I.e. I still think cleanup along the lines of the patch here is desirable, but I need to submit one that actually builds (the build failure the test robot encountered is a direct result of the clash between the two patches). I have that patch ready, but didn't want to submit before I got around to test it with 3.18-rc.
Jan
Re: [tip:x86/urgent] ix86: Fix build failure when !CONFIG_X86_IO_APIC
Quoted 24 lines · Jan Beulich
Quoted 15 lines
Quoted 1 line
Quoted 1 line · On 28.10.14 at 12:18, <[email protected]> wrote:
Commit-ID: a425cf83e39f99a70168c184e79cea8c67ba7c12 Gitweb: http://git.kernel.org/tip/a425cf83e39f99a70168c184e79cea8c67ba7c12 Author: Jan Beulich <[email protected]> AuthorDate: Tue, 16 Sep 2014 13:44:24 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 28 Oct 2014 12:01:09 +0100ix86: Fix build failure when !CONFIG_X86_IO_APIC
mp_should_keep_irq()isn't really IO-APIC related, and considering that it's being used solely inarch/x86/pci/likely both declaration and definition got misplaced even without considering the resulting build failure:Quoted 6 lines
.../arch/x86/pci/irq.c: In function ‘pirq_disable_irq’:
.../arch/x86/pci/irq.c:1259: error: implicit declaration of function
‘mp_should_keep_irq’
make[3]: *** [arch/x86/pci/irq.o] Error 1Move them to better places.
Ingo,
Quoted 8 lines
the build failure had got addressed by a different patch already, albeit that patch seems far from ideal to me. I.e. I still think cleanup along the lines of the patch here is desirable, but I need to submit one that actually builds (the build failure the test robot encountered is a direct result of the clash between the two patches). I have that patch ready, but didn't want to submit before I got around to test it with 3.18-rc.
Okay, I've removed it from x86/urgent. Note that it also generated this build failure:
./arch/x86/include/asm/io_apic.h:240:20: error: static declaration of ‘mp_should_keep_irq’ follows non-static declaration
Thanks,
Ingo
Re: [tip:x86/urgent] ix86: Fix build failure when !CONFIG_X86_IO_APIC
Quoted 38 lines
Quoted 1 line
Quoted 1 line · On 29.10.14 at 08:50, <[email protected]> wrote:
Quoted 3 lines · Jan Beulich
Quoted 3 lines
Quoted 1 line
Quoted 1 line · On 28.10.14 at 12:18, <[email protected]> wrote:
Commit-ID:
a425cf83e39f99a70168c184e79cea8c67ba7c12Gitweb:http://git.kernel.org/tip/a425cf83e39f99a70168c184e79cea8c67ba7c12
Quoted 21 lines
Quoted 12 lines
Author: Jan Beulich <[email protected]> AuthorDate: Tue, 16 Sep 2014 13:44:24 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 28 Oct 2014 12:01:09 +0100ix86: Fix build failure when !CONFIG_X86_IO_APIC
mp_should_keep_irq()isn't really IO-APIC related, and considering that it's being used solely inarch/x86/pci/likely both declaration and definition got misplaced even without considering the resulting build failure:Quoted 6 lines
.../arch/x86/pci/irq.c: In function ‘pirq_disable_irq’:
.../arch/x86/pci/irq.c:1259: error: implicit declaration of function
‘mp_should_keep_irq’
make[3]: *** [arch/x86/pci/irq.o] Error 1Move them to better places.
Ingo,
Quoted 8 lines
the build failure had got addressed by a different patch already, albeit that patch seems far from ideal to me. I.e. I still think cleanup along the lines of the patch here is desirable, but I need to submit one that actually builds (the build failure the test robot encountered is a direct result of the clash between the two patches). I have that patch ready, but didn't want to submit before I got around to test it with 3.18-rc.
Quoted 5 lines
Okay, I've removed it from x86/urgent. Note that it also generated this build failure:
./arch/x86/include/asm/io_apic.h:240:20: error: static declaration of ‘mp_should_keep_irq’ follows non-static declaration
Right - that's the one I was referring to above (actually iirc there are two relatively similar build failures resulting from the conflict).
Jan
Re: [tip:x86/urgent] ix86: Fix build failure when !CONFIG_X86_IO_APIC
Quoted 38 lines · Jan Beulich
Quoted 38 lines
Quoted 1 line
Quoted 1 line · On 29.10.14 at 08:50, <[email protected]> wrote:
Quoted 3 lines · Jan Beulich
Quoted 3 lines
Quoted 1 line
Quoted 1 line · On 28.10.14 at 12:18, <[email protected]> wrote:
Commit-ID:
a425cf83e39f99a70168c184e79cea8c67ba7c12Gitweb:http://git.kernel.org/tip/a425cf83e39f99a70168c184e79cea8c67ba7c12
Quoted 29 lines
Quoted 12 lines
Author: Jan Beulich <[email protected]> AuthorDate: Tue, 16 Sep 2014 13:44:24 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 28 Oct 2014 12:01:09 +0100ix86: Fix build failure when !CONFIG_X86_IO_APIC
mp_should_keep_irq()isn't really IO-APIC related, and considering that it's being used solely inarch/x86/pci/likely both declaration and definition got misplaced even without considering the resulting build failure:Quoted 6 lines
.../arch/x86/pci/irq.c: In function ‘pirq_disable_irq’:
.../arch/x86/pci/irq.c:1259: error: implicit declaration of function
‘mp_should_keep_irq’
make[3]: *** [arch/x86/pci/irq.o] Error 1Move them to better places.
Ingo,
the build failure had got addressed by a different patch already, albeit that patch seems far from ideal to me. I.e. I still think cleanup along the lines of the patch here is desirable, but I need to submit one that actually builds (the build failure the test robot encountered is a direct result of the clash between the two patches). I have that patch ready, but didn't want to submit before I got around to test it with 3.18-rc.
Quoted 8 lines
Quoted 5 lines
Okay, I've removed it from x86/urgent. Note that it also generated this build failure:
./arch/x86/include/asm/io_apic.h:240:20: error: static declaration of ‘mp_should_keep_irq’ follows non-static declarationRight - that's the one I was referring to above (actually iirc there are two relatively similar build failures resulting from the conflict).
Okay. I didn't mind your cleanup, so please follow it up and I'll apply it.
Thanks,
Ingo