[PATCH] next: microblaze: Fix build failure

[PATCH] next: microblaze: Fix build failure

[Guenter Roeck]

Microblaze build in linux-next fails with

arch/microblaze/kernel/timer.c:224:2: error:
	implicit declaration of function 'timecounter_init'

Caused by missing include file in microblaze timer code.

Fixes: 74d23cc704d1 ("time: move the timecounter/cyclecounter code into its own file")
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 arch/microblaze/kernel/timer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index dd96f0e..c897745 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -17,6 +17,7 @@
 #include <linux/clockchips.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <linux/timecounter.h>
 #include <asm/cpuinfo.h>
 
 static void __iomem *timer_baseaddr;
-- 
2.1.0

Re: [PATCH] next: microblaze: Fix build failure

[Richard Cochran]

On Sat, Jan 03, 2015 at 06:53:20AM -0800, Guenter Roeck wrote:
> Microblaze build in linux-next fails with
> 
> arch/microblaze/kernel/timer.c:224:2: error:
> 	implicit declaration of function 'timecounter_init'
> 
> Caused by missing include file in microblaze timer code.

Already fixed in net-next.

Thanks,
Richard

Re: [PATCH] next: microblaze: Fix build failure

[Guenter Roeck]

On Sat, Jan 03, 2015 at 06:01:18PM +0100, Richard Cochran wrote:
> On Sat, Jan 03, 2015 at 06:53:20AM -0800, Guenter Roeck wrote:
> > Microblaze build in linux-next fails with
> > 
> > arch/microblaze/kernel/timer.c:224:2: error:
> > 	implicit declaration of function 'timecounter_init'
> > 
> > Caused by missing include file in microblaze timer code.
> 
> Already fixed in net-next.
> 
The arm64 build is still broken in next-20150105 due to the same commit.

# bad: [35393dcb2ed331e8698a548fbba8042457f5fd32] Add linux-next specific files for 20150105
# good: [b7392d2247cfe6771f95d256374f1a8e6a6f48d6] Linux 3.19-rc2
git bisect start 'HEAD' 'v3.19-rc2'
# good: [0e549e6e3875b24240385b7d9ea6af202fe752ad] Merge remote-tracking branch 'slave-dma/next'
git bisect good 0e549e6e3875b24240385b7d9ea6af202fe752ad
# bad: [bd6327e236e94c0404af23c10e746e495a86836e] Merge remote-tracking branch 'virtio/virtio-next'
git bisect bad bd6327e236e94c0404af23c10e746e495a86836e
# bad: [f06c56ffe334bf2ae5ddde68f2321ec2f59bddd9] Merge remote-tracking branch 'bluetooth/master'
git bisect bad f06c56ffe334bf2ae5ddde68f2321ec2f59bddd9
# bad: [6c032edc8a338f7a5d7bbd3dd8a08ac80d37dd86] Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
git bisect bad 6c032edc8a338f7a5d7bbd3dd8a08ac80d37dd86
# bad: [01aa29978bda1978aaf56452122881a678f5dfd5] Merge branch 'gmac-next'
git bisect bad 01aa29978bda1978aaf56452122881a678f5dfd5
# bad: [87897931c83038af4931990af5b9365b41829921] tun: Fixed unsigned/signed comparison
git bisect bad 87897931c83038af4931990af5b9365b41829921
# bad: [fea3cb063bf9b9d6b4efd5c973217a708812f5e2] ksz884x: Use setup_timer
git bisect bad fea3cb063bf9b9d6b4efd5c973217a708812f5e2
# bad: [5ee698e3677a1af8b731cc891e94be33b6572cfd] net: igb: convert to timecounter adjtime.
git bisect bad 5ee698e3677a1af8b731cc891e94be33b6572cfd
# bad: [8b976e97772cfb7e0e4eb8682d5017861dbd8796] net: xgbe: convert to timecounter adjtime.
git bisect bad 8b976e97772cfb7e0e4eb8682d5017861dbd8796
# bad: [796c1efd6fa0ed696d550b68f4410ab1a1749d01] timecounter: provide a helper function to shift the time.
git bisect bad 796c1efd6fa0ed696d550b68f4410ab1a1749d01
# bad: [74d23cc704d19732e70ef1579a669f7d5f09dd9a] time: move the timecounter/cyclecounter code into its own file.
git bisect bad 74d23cc704d19732e70ef1579a669f7d5f09dd9a
# first bad commit: [74d23cc704d19732e70ef1579a669f7d5f09dd9a] time: move the timecounter/cyclecounter code into its own file.

Did you fix that already as well ?

Thanks,
Guenter

Re: [PATCH] next: microblaze: Fix build failure

[Richard Cochran]

On Mon, Jan 05, 2015 at 12:52:12AM -0800, Guenter Roeck wrote:
> On Sat, Jan 03, 2015 at 06:01:18PM +0100, Richard Cochran wrote:
> > On Sat, Jan 03, 2015 at 06:53:20AM -0800, Guenter Roeck wrote:
> > > Microblaze build in linux-next fails with
> > > 
> > > arch/microblaze/kernel/timer.c:224:2: error:
> > > 	implicit declaration of function 'timecounter_init'
> > > 
> > > Caused by missing include file in microblaze timer code.
> > 
> > Already fixed in net-next.
> > 
> The arm64 build is still broken in next-20150105 due to the same commit.

Do you mean drivers/clocksource/arm_arch_timer.c?

> Did you fix that already as well ?

Nope. It probably needs just one line:

+ #include <linux/timecounter.h>

Can you please test build that for me?

Thanks,
Richard

Re: [PATCH] next: microblaze: Fix build failure

[Richard Cochran]

On Mon, Jan 05, 2015 at 02:52:59PM +0100, Richard Cochran wrote:
> Nope. It probably needs just one line:
> 
> + #include <linux/timecounter.h>

A better fix would be to add this one line into

	include/clocksource/arm_arch_timer.h

because that will fix

	virt/kvm/arm/arch_timer.c

which I surely also broke.

Thanks,
Richard

Re: [PATCH] next: microblaze: Fix build failure

[Richard Cochran]

On Mon, Jan 05, 2015 at 03:43:22PM +0100, Richard Cochran wrote:
> A better fix would be to add this one line into
> 
> 	include/clocksource/arm_arch_timer.h

On second glance, this is not right. I just posted the correct fix.

Thanks,
Richard