tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
"Two small fixes for the new CLKEVT_OF infrastructure"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
vmlinux.lds: Add __clkevt_of_table to kernel
clockevents: Fix syntax error in clkevt-of macro

Linus Torvalds 4a6808f3 907977b2

+4 -2
+1 -1
drivers/clocksource/clkevt-probe.c
··· 17 17 18 18 #include <linux/init.h> 19 19 #include <linux/of.h> 20 - #include <linux/clockchip.h> 20 + #include <linux/clockchips.h> 21 21 22 22 extern struct of_device_id __clkevt_of_table[]; 23 23
+2
include/asm-generic/vmlinux.lds.h
··· 173 173 KEEP(*(__##name##_of_table_end)) 174 174 175 175 #define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) 176 + #define CLKEVT_OF_TABLES() OF_TABLE(CONFIG_CLKEVT_OF, clkevt) 176 177 #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) 177 178 #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) 178 179 #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) ··· 560 559 CLK_OF_TABLES() \ 561 560 RESERVEDMEM_OF_TABLES() \ 562 561 CLKSRC_OF_TABLES() \ 562 + CLKEVT_OF_TABLES() \ 563 563 IOMMU_OF_TABLES() \ 564 564 CPU_METHOD_OF_TABLES() \ 565 565 CPUIDLE_METHOD_OF_TABLES() \
+1 -1
include/linux/clockchips.h
··· 229 229 230 230 #ifdef CONFIG_CLKEVT_PROBE 231 231 extern int clockevent_probe(void); 232 - #els 232 + #else 233 233 static inline int clockevent_probe(void) { return 0; } 234 234 #endif 235 235