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

[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@xxxxxxxxxxxxxxxx>
Date: Fri, 13 May 2011 14:48:36 +1000
Subject: [PATCH] clocksource: fix up for generic i8253 conversions

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/