fix compile breakage caused by 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea
PATCH 1/1 fix compile breakage caused by 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea
Quoted 1 line
From
bd011c0cc51ce1fbab95403a570a8b47ad6ba500Mon Sep 17 00:00:00 2001
From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:19:49 -0500
Subject: [VOYAGER] x86: Fix subarch compile breakage
commit 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea
Author: Cyrill Gorcunov <[email protected]> Date: Mon Aug 11 18:34:08 2008 +0400
x86: apic interrupts - move assignments to irqinit_32.c, v2
Wrongly moved irq2 setup out of the mach-default/setup.c file. This causes a breakage on voyager which needs its own version. Fix by moving it back again.
--- arch/x86/kernel/irqinit_32.c | 12 ------------ arch/x86/mach-default/setup.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)
arch/x86/kernel/irqinit_32.c +0 -12
@@ -81,15 +81,6 @@ void __init init_ISA_irqs (void) } } -/* -* IRQ2 is cascade interrupt to second interrupt controller -*/ -static struct irqaction irq2 = { - .handler = no_action, - .mask =CPU_MASK_NONE , - .name ="cascade" , -}; - DEFINE_PER_CPU(vector_irq_t, vector_irq) = { [0 ... IRQ0_VECTOR - 1] = -1, [IRQ0_VECTOR] = 0,
@@ -167,9 +158,6 @@ void __init native_init_IRQ(void)alloc_intr_gate (THERMAL_APIC_VECTOR , thermal_interrupt);#endif -if (!acpi_ioapic) -setup_irq (2 , &irq2); -/* setup after call gates are initialised (usually add in * the architecture specific gates) */
arch/x86/mach-default/setup.c +12 -0
@@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void)init_ISA_irqs (); } +/* +* IRQ2 is cascade interrupt to second interrupt controller +*/ +static struct irqaction irq2 = { + .handler = no_action, + .mask =CPU_MASK_NONE , + .name ="cascade" , +}; +/** * intr_init_hook - post gate setup interrupt initialisation *
@@ -53,6 +62,9 @@ void __init intr_init_hook(void)if (x86_quirks->arch_intr_init ())return ; } +if (!acpi_ioapic) +setup_irq (2 , &irq2); + }/**
Signature · 1 line
1.5.6.5
Quoted 72 lines · James Bottomley
Quoted 1 line
From
bd011c0cc51ce1fbab95403a570a8b47ad6ba500Mon Sep 17 00:00:00 2001From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:19:49 -0500
Subject: [VOYAGER] x86: Fix subarch compile breakagecommit
2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeeaAuthor: Cyrill Gorcunov <[email protected]> Date: Mon Aug 11 18:34:08 2008 +0400x86: apic interrupts - move assignments to
irqinit_32.c, v2Wrongly moved irq2 setup out of the
mach-default/setup.cfile. This causes a breakage on voyager which needs its own version. Fix by moving it back again.Signed-off-by James Bottomley <[email protected]>--- arch/x86/kernel/irqinit_32.c | 12 ------------ arch/x86/mach-default/setup.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)arch/x86/kernel/irqinit_32.c +0
-12@@ -81,15 +81,6 @@ void __init init_ISA_irqs (void) } } -/* -* IRQ2 is cascade interrupt to second interrupt controller -*/ -static struct irqaction irq2 = { - .handler = no_action, - .mask =CPU_MASK_NONE , - .name ="cascade" , -}; - DEFINE_PER_CPU(vector_irq_t, vector_irq) = { [0 ... IRQ0_VECTOR - 1] = -1, [IRQ0_VECTOR] = 0,@@ -167,9 +158,6 @@ void __init native_init_IRQ(void)alloc_intr_gate (THERMAL_APIC_VECTOR , thermal_interrupt);#endif -if (!acpi_ioapic) -setup_irq (2 , &irq2); -/* setup after call gates are initialised (usually add in * the architecture specific gates) */ arch/x86/mach-default/setup.c +9
-0@@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void)init_ISA_irqs (); } +/* +* IRQ2 is cascade interrupt to second interrupt controller +*/ +static struct irqaction irq2 = { + .handler = no_action, + .mask =CPU_MASK_NONE , + .name ="cascade" , +}; +/** * intr_init_hook - post gate setup interrupt initialisation *
arch/x86/mach-default/setup.c void __init intr_init_hook(void) · line 68
Quoted 7 lines
arch/x86/mach-default/setup.c +3
-0@@ -53,6 +62,9 @@ void __init intr_init_hook(void)if (x86_quirks->arch_intr_init ())return ; } +if (!acpi_ioapic) +setup_irq (2 , &irq2); + }
hm, this change looks backwards (doubly so ;-).
Is the build problem caused by the lack of the acpi_ioapic flag on Voyager?
Ingo
Quoted 85 lines · Ingo Molnar
Quoted 72 lines · James Bottomley
Quoted 1 line
From
bd011c0cc51ce1fbab95403a570a8b47ad6ba500Mon Sep 17 00:00:00 2001From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:19:49 -0500
Subject: [VOYAGER] x86: Fix subarch compile breakagecommit
2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeeaAuthor: Cyrill Gorcunov <[email protected]> Date: Mon Aug 11 18:34:08 2008 +0400x86: apic interrupts - move assignments to
irqinit_32.c, v2Wrongly moved irq2 setup out of the
mach-default/setup.cfile. This causes a breakage on voyager which needs its own version. Fix by moving it back again.Signed-off-by James Bottomley <[email protected]>--- arch/x86/kernel/irqinit_32.c | 12 ------------ arch/x86/mach-default/setup.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)arch/x86/kernel/irqinit_32.c +0
-12@@ -81,15 +81,6 @@ void __init init_ISA_irqs (void) } } -/* -* IRQ2 is cascade interrupt to second interrupt controller -*/ -static struct irqaction irq2 = { - .handler = no_action, - .mask =CPU_MASK_NONE , - .name ="cascade" , -}; - DEFINE_PER_CPU(vector_irq_t, vector_irq) = { [0 ... IRQ0_VECTOR - 1] = -1, [IRQ0_VECTOR] = 0,@@ -167,9 +158,6 @@ void __init native_init_IRQ(void)alloc_intr_gate (THERMAL_APIC_VECTOR , thermal_interrupt);#endif -if (!acpi_ioapic) -setup_irq (2 , &irq2); -/* setup after call gates are initialised (usually add in * the architecture specific gates) */ arch/x86/mach-default/setup.c +9
-0@@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void)init_ISA_irqs (); } +/* +* IRQ2 is cascade interrupt to second interrupt controller +*/ +static struct irqaction irq2 = { + .handler = no_action, + .mask =CPU_MASK_NONE , + .name ="cascade" , +}; +/** * intr_init_hook - post gate setup interrupt initialisation * arch/x86/mach-default/setup.c void __init intr_init_hook(void) · line 68
Quoted 7 lines
arch/x86/mach-default/setup.c +3
-0@@ -53,6 +62,9 @@ void __init intr_init_hook(void)if (x86_quirks->arch_intr_init ())return ; } +if (!acpi_ioapic) +setup_irq (2 , &irq2); + }hm, this change looks backwards (doubly so ;-).
Quoted 5 lines
Is the build problem caused by the lack of the
acpi_ioapicflag on Voyager?Ingo
Thanks for report, cant get access to sources right now -- will check it later.
Quoted 86 lines · Cyrill Gorcunov
Quoted 85 lines · Ingo Molnar
Quoted 72 lines · James Bottomley
Quoted 1 line
From
bd011c0cc51ce1fbab95403a570a8b47ad6ba500Mon Sep 17 00:00:00 2001From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:19:49 -0500
Subject: [VOYAGER] x86: Fix subarch compile breakagecommit
2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeeaAuthor: Cyrill Gorcunov <[email protected]> Date: Mon Aug 11 18:34:08 2008 +0400x86: apic interrupts - move assignments to
irqinit_32.c, v2Wrongly moved irq2 setup out of the
mach-default/setup.cfile. This causes a breakage on voyager which needs its own version. Fix by moving it back again.Signed-off-by James Bottomley <[email protected]>--- arch/x86/kernel/irqinit_32.c | 12 ------------ arch/x86/mach-default/setup.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)arch/x86/kernel/irqinit_32.c +0
-12@@ -81,15 +81,6 @@ void __init init_ISA_irqs (void) } } -/* -* IRQ2 is cascade interrupt to second interrupt controller -*/ -static struct irqaction irq2 = { - .handler = no_action, - .mask =CPU_MASK_NONE , - .name ="cascade" , -}; - DEFINE_PER_CPU(vector_irq_t, vector_irq) = { [0 ... IRQ0_VECTOR - 1] = -1, [IRQ0_VECTOR] = 0,@@ -167,9 +158,6 @@ void __init native_init_IRQ(void)alloc_intr_gate (THERMAL_APIC_VECTOR , thermal_interrupt);#endif -if (!acpi_ioapic) -setup_irq (2 , &irq2); -/* setup after call gates are initialised (usually add in * the architecture specific gates) */ arch/x86/mach-default/setup.c +9
-0@@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void)init_ISA_irqs (); } +/* +* IRQ2 is cascade interrupt to second interrupt controller +*/ +static struct irqaction irq2 = { + .handler = no_action, + .mask =CPU_MASK_NONE , + .name ="cascade" , +}; +/** * intr_init_hook - post gate setup interrupt initialisation * arch/x86/mach-default/setup.c void __init intr_init_hook(void) · line 68
Quoted 7 lines
arch/x86/mach-default/setup.c +3
-0@@ -53,6 +62,9 @@ void __init intr_init_hook(void)if (x86_quirks->arch_intr_init ())return ; } +if (!acpi_ioapic) +setup_irq (2 , &irq2); + }hm, this change looks backwards (doubly so ;-).
Quoted 8 lines
Quoted 5 lines
Is the build problem caused by the lack of the
acpi_ioapicflag on Voyager?Ingo
Thanks for report, cant get access to sources right now -- will check it later.
Btw James, what the build bug message was? Could you post it please?
Quoted 90 lines · Cyrill Gorcunov
Quoted 89 lines · Cyrill Gorcunov
Quoted 88 lines · Ingo Molnar
Quoted 72 lines · James Bottomley
Quoted 1 line
From
bd011c0cc51ce1fbab95403a570a8b47ad6ba500Mon Sep 17 00:00:00 2001From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:19:49 -0500
Subject: [VOYAGER] x86: Fix subarch compile breakagecommit
2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeeaAuthor: Cyrill Gorcunov <[email protected]> Date: Mon Aug 11 18:34:08 2008 +0400x86: apic interrupts - move assignments to
irqinit_32.c, v2Wrongly moved irq2 setup out of the
mach-default/setup.cfile. This causes a breakage on voyager which needs its own version. Fix by moving it back again.Signed-off-by James Bottomley <[email protected]>--- arch/x86/kernel/irqinit_32.c | 12 ------------ arch/x86/mach-default/setup.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)arch/x86/kernel/irqinit_32.c +0
-12@@ -81,15 +81,6 @@ void __init init_ISA_irqs (void) } } -/* -* IRQ2 is cascade interrupt to second interrupt controller -*/ -static struct irqaction irq2 = { - .handler = no_action, - .mask =CPU_MASK_NONE , - .name ="cascade" , -}; - DEFINE_PER_CPU(vector_irq_t, vector_irq) = { [0 ... IRQ0_VECTOR - 1] = -1, [IRQ0_VECTOR] = 0,@@ -167,9 +158,6 @@ void __init native_init_IRQ(void)alloc_intr_gate (THERMAL_APIC_VECTOR , thermal_interrupt);#endif -if (!acpi_ioapic) -setup_irq (2 , &irq2); -/* setup after call gates are initialised (usually add in * the architecture specific gates) */ arch/x86/mach-default/setup.c +9
-0@@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void)init_ISA_irqs (); } +/* +* IRQ2 is cascade interrupt to second interrupt controller +*/ +static struct irqaction irq2 = { + .handler = no_action, + .mask =CPU_MASK_NONE , + .name ="cascade" , +}; +/** * intr_init_hook - post gate setup interrupt initialisation * arch/x86/mach-default/setup.c void __init intr_init_hook(void) · line 68
Quoted 7 lines
arch/x86/mach-default/setup.c +3
-0@@ -53,6 +62,9 @@ void __init intr_init_hook(void)if (x86_quirks->arch_intr_init ())return ; } +if (!acpi_ioapic) +setup_irq (2 , &irq2); + }hm, this change looks backwards (doubly so ;-).
Is the build problem caused by the lack of the
acpi_ioapicflag on Voyager?
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Ingo
Thanks for report, cant get access to sources right now -- will check it later.
Btw James, what the build bug message was? Could you post it please?
it gives a compile failure because acpi_ioapic isn't defined on Voyager ... however voyager also currently has its own setup for irq2 which would need to be fixed as well.
James
[Ingo Molnar - Thu, Oct 30, 2008 at 11:06:53PM +0100]
| | * James Bottomley <[email protected]> wrote: | | > >From bd011c0cc51ce1fbab95403a570a8b47ad6ba500 Mon Sep 17 00:00:00 2001 | > From: James Bottomley <[email protected]> | > Date: Wed, 29 Oct 2008 11:19:49 -0500 | > Subject: [VOYAGER] x86: Fix subarch compile breakage | > | > commit 2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeea | > Author: Cyrill Gorcunov <[email protected]> | > Date: Mon Aug 11 18:34:08 2008 +0400 | > | > x86: apic interrupts - move assignments to irqinit_32.c, v2 | > | > Wrongly moved irq2 setup out of the mach-default/setup.c file. This | > causes a breakage on voyager which needs its own version. Fix by | > moving it back again. | > | > Signed-off-by: James Bottomley <[email protected]> | > --- | > arch/x86/kernel/irqinit_32.c | 12 ------------ | > arch/x86/mach-default/setup.c | 12 ++++++++++++ | > 2 files changed, 12 insertions(+), 12 deletions(-) | > | > diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c | > index 845aa98..3928784 100644 | > --- a/arch/x86/kernel/irqinit_32.c | > +++ b/arch/x86/kernel/irqinit_32.c | > @@ -81,15 +81,6 @@ void __init init_ISA_irqs (void) | > } | > } | > | > -/* | > - * IRQ2 is cascade interrupt to second interrupt controller | > - */ | > -static struct irqaction irq2 = { | > - .handler = no_action, | > - .mask = CPU_MASK_NONE, | > - .name = "cascade", | > -}; | > - | > DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | > [0 ... IRQ0_VECTOR - 1] = -1, | > [IRQ0_VECTOR] = 0, | > @@ -167,9 +158,6 @@ void __init native_init_IRQ(void) | > alloc_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | > #endif | > | > - if (!acpi_ioapic) | > - setup_irq(2, &irq2); | > - | > /* setup after call gates are initialised (usually add in | > * the architecture specific gates) | > */ | > diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c | > index 37b9ae4..53b4202 100644 | > --- a/arch/x86/mach-default/setup.c | > +++ b/arch/x86/mach-default/setup.c | > @@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void) | > init_ISA_irqs(); | > } | > | > +/* | > + * IRQ2 is cascade interrupt to second interrupt controller | > + */ | > +static struct irqaction irq2 = { | > + .handler = no_action, | > + .mask = CPU_MASK_NONE, | > + .name = "cascade", | > +}; | > + | > /** | > * intr_init_hook - post gate setup interrupt initialisation | > * | > @@ -53,6 +62,9 @@ void __init intr_init_hook(void) | > if (x86_quirks->arch_intr_init()) | > return; | > } | > + if (!acpi_ioapic) | > + setup_irq(2, &irq2); | > + | > } | | hm, this change looks backwards (doubly so ;-). | | Is the build problem caused by the lack of the acpi_ioapic flag on | Voyager? | | Ingo |
James, how about to use x86_quirks->arch_intr_init() for this? Wouldn't it be more convenient?
(I was trying to reproduce this bug -- so I fetched latest tip/master
since there a lot of your fixes already should be
commit dda51106620c328b50007c259b9ef8cea2b7c3d2 Merge: 3391961... a376f30... Author: Ingo Molnar <[email protected]> Date: Fri Oct 31 11:03:54 2008 +0100 Merge branch 'x86/cleanups'
but eventually I've got build-bug-storm and gave up :-)
- Cyrill -
Quoted 84 lines · Ingo Molnar
Quoted 72 lines · James Bottomley
Quoted 1 line
From
bd011c0cc51ce1fbab95403a570a8b47ad6ba500Mon Sep 17 00:00:00 2001From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:19:49 -0500
Subject: [VOYAGER] x86: Fix subarch compile breakagecommit
2ae111cdd8d83ebf9de72e36e68a8c84b6ebbeeaAuthor: Cyrill Gorcunov <[email protected]> Date: Mon Aug 11 18:34:08 2008 +0400x86: apic interrupts - move assignments to
irqinit_32.c, v2Wrongly moved irq2 setup out of the
mach-default/setup.cfile. This causes a breakage on voyager which needs its own version. Fix by moving it back again.Signed-off-by James Bottomley <[email protected]>--- arch/x86/kernel/irqinit_32.c | 12 ------------ arch/x86/mach-default/setup.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)arch/x86/kernel/irqinit_32.c +0
-12@@ -81,15 +81,6 @@ void __init init_ISA_irqs (void) } } -/* -* IRQ2 is cascade interrupt to second interrupt controller -*/ -static struct irqaction irq2 = { - .handler = no_action, - .mask =CPU_MASK_NONE , - .name ="cascade" , -}; - DEFINE_PER_CPU(vector_irq_t, vector_irq) = { [0 ... IRQ0_VECTOR - 1] = -1, [IRQ0_VECTOR] = 0,@@ -167,9 +158,6 @@ void __init native_init_IRQ(void)alloc_intr_gate (THERMAL_APIC_VECTOR , thermal_interrupt);#endif -if (!acpi_ioapic) -setup_irq (2 , &irq2); -/* setup after call gates are initialised (usually add in * the architecture specific gates) */ arch/x86/mach-default/setup.c +9
-0@@ -38,6 +38,15 @@ void __init pre_intr_init_hook(void)init_ISA_irqs (); } +/* +* IRQ2 is cascade interrupt to second interrupt controller +*/ +static struct irqaction irq2 = { + .handler = no_action, + .mask =CPU_MASK_NONE , + .name ="cascade" , +}; +/** * intr_init_hook - post gate setup interrupt initialisation * arch/x86/mach-default/setup.c void __init intr_init_hook(void) · line 68
Quoted 7 lines
arch/x86/mach-default/setup.c +3
-0@@ -53,6 +62,9 @@ void __init intr_init_hook(void)if (x86_quirks->arch_intr_init ())return ; } +if (!acpi_ioapic) +setup_irq (2 , &irq2); + }hm, this change looks backwards (doubly so ;-).
Quoted 2 lines
Is the build problem caused by the lack of the
acpi_ioapicflag on Voyager?
Yes, exactly ... and it has no apic or acpi ... I suppose something like this could be used instead.
It would be fixable by stripping the irq2 setup from voyager and directly #including asm/acpi.h in irqinit_32.c, but that would pull in mpspec.h as well, with its associated problems.
an alternative might be to abstract out a explicit_irq2_setup variable and making that be !acpi_ioapic on PC and 1 on voyager.
James