linux-next: build failure after merge of the arm tree

linux-next: build failure after merge of the arm tree

[Stephen Rothwell]

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

Hi Russell,

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

drivers/built-in.o: In function `__sp804_clocksource_and_sched_clock_init':
(.init.text+0x1a0e7): undefined reference to `sched_clock_register'

Presumably caused by commit 5261ef2ea836 ("ARM: 8366/1: move Dual-Timer
SP804 driver to drivers/clocksource").

I have used the arm tree from next-20150528 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH] clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK

[Sudeep Holla]

Commit 5261ef2ea836 ("ARM: 8366/1: move Dual-Timer SP804 driver to
drivers/clocksource") moved SP804 to drivers/clocksource resulting in
it being selectable on platforms/architectures without the config
GENERIC_SCHED_CLOCK enabled. Due to that, it results in the following
build failure(e.g. x86_64 allmodconfig)

drivers/built-in.o: In function `__sp804_clocksource_and_sched_clock_init':
(.init.text+0x1a0e7): undefined reference to `sched_clock_register'

This patch fixes the build by making ARM_TIMER_SP804 depend on
GENERIC_SCHED_CLOCK

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/clocksource/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Hi Russell,

If you are fine with this fix, I will put this into the patch tracker.

Regards,
Sudeep

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 0f1c0e7f86da..50534704486a 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -134,6 +134,7 @@ config ARM_GLOBAL_TIMER

 config ARM_TIMER_SP804
 	bool "Support for Dual Timer SP804 module"
+	depends on GENERIC_SCHED_CLOCK
 	select CLKSRC_MMIO
 	select CLKSRC_OF if OF

--
1.9.1

Re: [PATCH] clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK

[Sudeep Holla]

On 29/05/15 09:17, Sudeep Holla wrote:
> Commit 5261ef2ea836 ("ARM: 8366/1: move Dual-Timer SP804 driver to
> drivers/clocksource") moved SP804 to drivers/clocksource resulting in
> it being selectable on platforms/architectures without the config
> GENERIC_SCHED_CLOCK enabled. Due to that, it results in the following
> build failure(e.g. x86_64 allmodconfig)
>
> drivers/built-in.o: In function `__sp804_clocksource_and_sched_clock_init':
> (.init.text+0x1a0e7): undefined reference to `sched_clock_register'
>
> This patch fixes the build by making ARM_TIMER_SP804 depend on
> GENERIC_SCHED_CLOCK
>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
>   drivers/clocksource/Kconfig | 1 +
>   1 file changed, 1 insertion(+)
>
> Hi Russell,
>
> If you are fine with this fix, I will put this into the patch tracker.
>

I have put this in patch tracker (8382/1)[1]

Regards,
Sudeep

[1] http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=8382/1