Skip to contentSkip to conversation

fix smp_intr_init() compile breakage

VOYAGER Applied James Bottomley 2 participants 4 messages Oct 30, 2008 – Nov 3, 2008 x86

lore
Share & tools
lore
#0 lore raw
Quoted 1 line

From 4d4d1ebea1e30d0ea51784139f18aa15acbff5d9 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:13:33 -0500
Subject: [VOYAGER] x86: fix smp_intr_init() compile breakage

Looks like this became static on the rest of x86. Fix it up by adding an external definition to mach-voyager/setup.c

---
 arch/x86/mach-voyager/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/mach-voyager/setup.c +1 -1
index 6bbdd63..7c6ff1a 100644
@@ -24,6 +24,7 @@ static struct irqaction irq2 = {
 	.name = "cascade",
 };
 
+extern void smp_intr_init(void);
 void __init intr_init_hook(void)
 {
 #ifdef CONFIG_SMP
@@ -62,7 +63,6 @@ void __init time_init_hook(void)
 char *__init machine_specific_memory_setup(void)
 {
 	char *who;
-	int new_nr;
 
 	who = "NOT VOYAGER";
 
Signature · 1 line
1.5.6.5
#1 lore raw
Quoted 18 lines · James Bottomley
Quoted 1 line

From 4d4d1ebea1e30d0ea51784139f18aa15acbff5d9 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:13:33 -0500
Subject: [VOYAGER] x86: fix smp_intr_init() compile breakage

Looks like this became static on the rest of x86. Fix it up by adding an external definition to mach-voyager/setup.c

---
 arch/x86/mach-voyager/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/mach-voyager/setup.c +0 -0
index 6bbdd63..7c6ff1a 100644

arch/x86/mach-voyager/setup.c static struct irqaction irq2 = { · line 28

Quoted 5 lines
arch/x86/mach-voyager/setup.c +1 -0
@@ -24,6 +24,7 @@ static struct irqaction irq2 = {
 	.name = "cascade",
 };
 
+extern void smp_intr_init(void);
 void __init intr_init_hook(void)

please add function prototypes to the proper .h file. (arch/x86/include/asm/voyager.h in this case)

I'd also suggest to rename the function to voyager_smp_intr_init().

Note that Voyager already has a voyager_smp_intr_init() prototype in voyager.h. Something like the (completely untested) patch below.

Ingo

---
 arch/x86/mach-voyager/setup.c       |    2 +-
 arch/x86/mach-voyager/voyager_smp.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mach-voyager/setup.c +1 -1
index 6bbdd63..a580b95 100644
@@ -27,7 +27,7 @@ static struct irqaction irq2 = {
 void __init intr_init_hook(void)
 {
 #ifdef CONFIG_SMP
-	smp_intr_init();
+	voyager_smp_intr_init();
 #endif
 
 	setup_irq(2, &irq2);
arch/x86/mach-voyager/voyager_smp.c +1 -1
index ff2b2ed..95c9035 100644
@@ -1250,7 +1250,7 @@ static void handle_vic_irq(unsigned int irq, struct irq_desc *desc)
 #define QIC_SET_GATE(cpi, vector) \
 	set_intr_gate((cpi) + QIC_DEFAULT_CPI_BASE, (vector))
 
-void __init smp_intr_init(void)
+void __init voyager_smp_intr_init(void)
 {
 	int i;
 
#2 lore raw
Quoted 59 lines · Ingo Molnar
Quoted 18 lines · James Bottomley
Quoted 1 line

From 4d4d1ebea1e30d0ea51784139f18aa15acbff5d9 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:13:33 -0500
Subject: [VOYAGER] x86: fix smp_intr_init() compile breakage

Looks like this became static on the rest of x86. Fix it up by adding an external definition to mach-voyager/setup.c

---
 arch/x86/mach-voyager/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/mach-voyager/setup.c +0 -0
index 6bbdd63..7c6ff1a 100644

arch/x86/mach-voyager/setup.c static struct irqaction irq2 = { · line 28

Quoted 5 lines
arch/x86/mach-voyager/setup.c +1 -0
@@ -24,6 +24,7 @@ static struct irqaction irq2 = {
 	.name = "cascade",
 };
 
+extern void smp_intr_init(void);
 void __init intr_init_hook(void)

please add function prototypes to the proper .h file. (arch/x86/include/asm/voyager.h in this case)

I'd also suggest to rename the function to voyager_smp_intr_init().

Note that Voyager already has a voyager_smp_intr_init() prototype in voyager.h. Something like the (completely untested) patch below.

Ingo

---
 arch/x86/mach-voyager/setup.c       |    2 +-
 arch/x86/mach-voyager/voyager_smp.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mach-voyager/setup.c +1 -1
index 6bbdd63..a580b95 100644
@@ -27,7 +27,7 @@ static struct irqaction irq2 = {
 void __init intr_init_hook(void)
 {
 #ifdef CONFIG_SMP
-	smp_intr_init();
+	voyager_smp_intr_init();
 #endif
 
 	setup_irq(2, &irq2);
arch/x86/mach-voyager/voyager_smp.c +0 -0
index ff2b2ed..95c9035 100644

arch/x86/mach-voyager/voyager_smp.c static void handle_vic_irq(unsigned int irq, struct irq_desc *desc) · line 1255

Quoted 7 lines
arch/x86/mach-voyager/voyager_smp.c +1 -1
@@ -1250,7 +1250,7 @@ static void handle_vic_irq(unsigned int irq, struct irq_desc *desc)
 #define QIC_SET_GATE(cpi, vector) \
 	set_intr_gate((cpi) + QIC_DEFAULT_CPI_BASE, (vector))
 
-void __init smp_intr_init(void)
+void __init voyager_smp_intr_init(void)
 {
 	int i;

Not quite: still get the undeclared function in setup.c. However, this should work (also untested: I'm in flight at the moment).

James

---

arch/x86/include/asm/voyager.h +1 -0
index 9c811d2..b3e6473 100644
@@ -520,6 +520,7 @@ extern void voyager_restart(void);
 extern void voyager_cat_power_off(void);
 extern void voyager_cat_do_common_interrupt(void);
 extern void voyager_handle_nmi(void);
+extern void voyager_smp_intr_init(void);
 /* Commands for the following are */
 #define	VOYAGER_PSI_READ	0
 #define VOYAGER_PSI_WRITE	1
arch/x86/mach-voyager/setup.c +1 -1
index 6bbdd63..a580b95 100644
@@ -27,7 +27,7 @@ static struct irqaction irq2 = {
 void __init intr_init_hook(void)
 {
 #ifdef CONFIG_SMP
-	smp_intr_init();
+	voyager_smp_intr_init();
 #endif
 
 	setup_irq(2, &irq2);
arch/x86/mach-voyager/voyager_smp.c +1 -1
index 0f6e8a6..593967b 100644
@@ -1248,7 +1248,7 @@ static void handle_vic_irq(unsigned int irq, struct irq_desc *desc)
 #define QIC_SET_GATE(cpi, vector) \
 	set_intr_gate((cpi) + QIC_DEFAULT_CPI_BASE, (vector))
 
-void __init smp_intr_init(void)
+void __init voyager_smp_intr_init(void)
 {
 	int i;
 
Applied
#3 lore raw
Quoted 63 lines · James Bottomley
Quoted 62 lines · Ingo Molnar
Quoted 18 lines · James Bottomley
Quoted 1 line

From 4d4d1ebea1e30d0ea51784139f18aa15acbff5d9 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 11:13:33 -0500
Subject: [VOYAGER] x86: fix smp_intr_init() compile breakage

Looks like this became static on the rest of x86. Fix it up by adding an external definition to mach-voyager/setup.c

---
 arch/x86/mach-voyager/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/mach-voyager/setup.c +0 -0
index 6bbdd63..7c6ff1a 100644

arch/x86/mach-voyager/setup.c static struct irqaction irq2 = { · line 28

Quoted 5 lines
arch/x86/mach-voyager/setup.c +1 -0
@@ -24,6 +24,7 @@ static struct irqaction irq2 = {
 	.name = "cascade",
 };
 
+extern void smp_intr_init(void);
 void __init intr_init_hook(void)

please add function prototypes to the proper .h file. (arch/x86/include/asm/voyager.h in this case)

I'd also suggest to rename the function to voyager_smp_intr_init().

Note that Voyager already has a voyager_smp_intr_init() prototype in voyager.h. Something like the (completely untested) patch below.

Ingo

---
 arch/x86/mach-voyager/setup.c       |    2 +-
 arch/x86/mach-voyager/voyager_smp.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mach-voyager/setup.c +1 -1
index 6bbdd63..a580b95 100644
@@ -27,7 +27,7 @@ static struct irqaction irq2 = {
 void __init intr_init_hook(void)
 {
 #ifdef CONFIG_SMP
-	smp_intr_init();
+	voyager_smp_intr_init();
 #endif
 
 	setup_irq(2, &irq2);
arch/x86/mach-voyager/voyager_smp.c +0 -0
index ff2b2ed..95c9035 100644
@@ -1250,7 +1250,7 @@ static void handle_vic_irq(unsigned int irq, struct irq_desc *desc)
 #define QIC_SET_GATE(cpi, vector) \
 	set_intr_gate((cpi) + QIC_DEFAULT_CPI_BASE, (vector))
 
Quoted 7 lines

arch/x86/mach-voyager/voyager_smp.c static void handle_vic_irq(unsigned int irq, struct irq_desc *desc) · line 1253

Quoted 4 lines
arch/x86/mach-voyager/voyager_smp.c +1 -1
-void __init smp_intr_init(void)
+void __init voyager_smp_intr_init(void)
 {
 	int i;

Not quite: still get the undeclared function in setup.c. However, this should work (also untested: I'm in flight at the moment).

applied to tip/x86/urgent, thanks James!

Ingo