clockevents 4.11 fixes
Subsystems (3)
Hi Thomas, Ingo,
This pull request provides a couple of fixes from Alexander Kochetkov regarding the clkevt-of probe interface where a typo and a missing declaration.
- Fix compilation error with the clkevt-probe interface (Alexander Kochetkov).
Thanks!
-- Daniel
The following changes since commit 33d8c15559df4f0bce25d7e16ebb5879e249f2e7:
Revert "clocksource/drivers/tcb_clksrc: Use 32 bit tcb as sched_clock" (2017-03-11 22:03:34 +0100)
are available in the git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/4.11-fixes
for you to fetch changes up to 8d09617b076fd03ee9ae124abce94dda17bf3723:
vmlinux.lds: Add __clkevt_of_table to kernel (2017-03-28 09:40:39 +0200)
----------------------------------------------------------------
Alexander Kochetkov (2):
clockevents: Fix syntax error in clkevt-of macro vmlinux.lds: Add __clkevt_of_table to kernel
drivers/clocksource/clkevt-probe.c | 2 +- include/asm-generic/vmlinux.lds.h | 2 ++ include/linux/clockchips.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH 1/2 clockevents: Fix syntax error in clkevt-of macro
From: Alexander Kochetkov <[email protected]>
The patch fix syntax errors introduced by commit 0c8893c9095d ("clockevents: Add a clkevt-of mechanism like clksrc-of").
--- drivers/clocksource/clkevt-probe.c | 2 +- include/linux/clockchips.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/clocksource/clkevt-probe.c +1 -1
@@ -17,7 +17,7 @@#include <linux/init.h> #include <linux/of.h> -#include <linux/clockchip.h> +#include <linux/clockchips.h> extern struct of_device_id __clkevt_of_table[];
include/linux/clockchips.h +1 -1
@@ -229,7 +229,7 @@ static inline void tick_setup_hrtimer_broadcast(void) { }#ifdef CONFIG_CLKEVT_PROBE extern int clockevent_probe (void ); -#els +#else static inline int clockevent_probe (void ) {return 0 ; }#endif
Signature · 1 line
2.7.4
PATCH 2/2 vmlinux.lds: Add __clkevt_of_table to kernel
From: Alexander Kochetkov <[email protected]>
The code introduced by commit 0c8893c9095d ("clockevents: Add a clkevt-of mechanism like clksrc-of") refer to __clkevt_of_table what doesn't exist in the vmlinux. As a result kernel build failed with error: "clkevt-probe.c:63: undefined reference to `__clkevt_of_table’"
--- include/asm-generic/vmlinux.lds.h | 2 ++ 1 file changed, 2 insertions(+)
include/asm-generic/vmlinux.lds.h +2 -0
@@ -173,6 +173,7 @@ KEEP(*(__##name##_of_table_end))#define CLKSRC_OF_TABLES () OF_TABLE(CONFIG_CLKSRC_OF, clksrc) +#define CLKEVT_OF_TABLES () OF_TABLE(CONFIG_CLKEVT_OF, clkevt)#define IRQCHIP_OF_MATCH_TABLE () OF_TABLE(CONFIG_IRQCHIP, irqchip)#define CLK_OF_TABLES () OF_TABLE(CONFIG_COMMON_CLK, clk)#define IOMMU_OF_TABLES () OF_TABLE(CONFIG_OF_IOMMU, iommu)
@@ -559,6 +560,7 @@ CLK_OF_TABLES() \ RESERVEDMEM_OF_TABLES() \ CLKSRC_OF_TABLES() \ + CLKEVT_OF_TABLES() \ IOMMU_OF_TABLES() \ CPU_METHOD_OF_TABLES() \CPUIDLE_METHOD_OF_TABLES () \
Signature · 1 line
2.7.4