linux-next: build failure after merge of the final tree (arm tree related)

linux-next: build failure after merge of the final tree (arm tree related)

[Stephen Rothwell]

Hi all,

After merging the final tree, today's linux-next build (i386 defconfig)
failed like this:

arch/x86/kernel/i8253.c: In function 'init_pit_clocksource':
arch/x86/kernel/i8253.c:133: error: implicit declaration of function 'clocksource_pit_init'

Caused by commit 3490f584b9ba ("clocksource: convert x86 to generic i8253 clocksource").

I took a punt and added the following patch for today (also attempting to
fix mips as well).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 May 2011 14:48:36 +1000
Subject: [PATCH] clocksource: fix up for generic i8253 conversions

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/mips/kernel/i8253.c |    3 ++-
 arch/x86/kernel/i8253.c  |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c
index e4660ba..227373e 100644
--- a/arch/mips/kernel/i8253.c
+++ b/arch/mips/kernel/i8253.c
@@ -10,6 +10,7 @@
 #include <linux/smp.h>
 #include <linux/spinlock.h>
 #include <linux/irq.h>
+#include <linux/clocksource.h>
 
 #include <asm/delay.h>
 #include <asm/i8253.h>
@@ -130,6 +131,6 @@ static int __init init_pit_clocksource(void)
 	if (num_possible_cpus() > 1) /* PIT does not scale! */
 		return 0;
 
-	return clocksource_pit_init();
+	return clocksource_i8253_init();
 }
 arch_initcall(init_pit_clocksource);
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
index a97aefc..21f121a 100644
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -11,6 +11,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/clocksource.h>
 
 #include <asm/i8253.h>
 #include <asm/hpet.h>
@@ -130,7 +131,7 @@ static int __init init_pit_clocksource(void)
 	    pit_ce.mode != CLOCK_EVT_MODE_PERIODIC)
 		return 0;
 
-	return clocksource_pit_init();
+	return clocksource_i8253_init();
 }
 arch_initcall(init_pit_clocksource);
 
-- 
1.7.5.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: build failure after merge of the final tree (arm tree related)

[Rob Herring]

On 09/03/2013 04:04 AM, Russell King wrote:
> On Tue, Sep 03, 2013 at 06:18:24PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the final tree, today's linux-next build (arm defconfig)
>> failed like this:
>>
>> arch/arm/kernel/built-in.o: In function `setup_arch':
>> io.c:(.init.text+0x594): undefined reference to `erratum_a15_798181_init'
>>
>> Presumably caused by commit 34905a33184a ("ARM: 7804/2: Add check for
>> Cortex-A15 errata 798181 ECO").  This build does not have CONFIG_SMP set.
>>
>> I have reverted that commit for today.
> 
> Yep, and I think I'm going to do the same, rather than try and fix it.
> 

Ah crap, I guess I should have left the ifdefs instead of trying to use
IS_ENABLED.

Here's a fix if you want it. Otherwise I can fold this in and resubmit it
rebased on top of Will's barriers series.

Rob

8<--------------------------------------------
From: Rob Herring <rob.herring@calxeda.com>
Date: Tue, 3 Sep 2013 07:35:41 -0500
Subject: [PATCH] ARM: fix undefined reference to erratum_a15_798181_init on
 !SMP

Fix build error on !SMP builds introduced by commit 34905a33184a ("ARM:
804/2: Add check for Cortex-A15 errata 798181 ECO"):

arch/arm/kernel/built-in.o: In function `setup_arch':
io.c:(.init.text+0x594): undefined reference to `erratum_a15_798181_init'

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
 arch/arm/include/asm/tlbflush.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h
index decff8d..e6217a1 100644
--- a/arch/arm/include/asm/tlbflush.h
+++ b/arch/arm/include/asm/tlbflush.h
@@ -443,7 +443,11 @@ static inline void local_flush_bp_all(void)
 		isb();
 }
 
+#ifdef CONFIG_ARM_ERRATA_798181
 extern void erratum_a15_798181_init(void);
+#else
+static inline void erratum_a15_798181_init(void) {}
+#endif
 extern bool (*erratum_a15_798181_handler)(void);
 
 static inline bool erratum_a15_798181(void)
-- 
1.8.1.2

Re: linux-next: build failure after merge of the final tree (arm tree related)

[Russell King]

On Tue, Sep 03, 2013 at 06:18:24PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the final tree, today's linux-next build (arm defconfig)
> failed like this:
> 
> arch/arm/kernel/built-in.o: In function `setup_arch':
> io.c:(.init.text+0x594): undefined reference to `erratum_a15_798181_init'
> 
> Presumably caused by commit 34905a33184a ("ARM: 7804/2: Add check for
> Cortex-A15 errata 798181 ECO").  This build does not have CONFIG_SMP set.
> 
> I have reverted that commit for today.

Yep, and I think I'm going to do the same, rather than try and fix it.

-- 
Russell King

linux-next: build failure after merge of the final tree (arm tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 496 bytes --]

Hi all,

After merging the final tree, today's linux-next build (arm defconfig)
failed like this:

arch/arm/kernel/built-in.o: In function `setup_arch':
io.c:(.init.text+0x594): undefined reference to `erratum_a15_798181_init'

Presumably caused by commit 34905a33184a ("ARM: 7804/2: Add check for
Cortex-A15 errata 798181 ECO").  This build does not have CONFIG_SMP set.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]