Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a6808f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 907977b2 8d09617b

drivers/clocksource/clkevt-probe.c

+1 −1
Original line number Diff line number Diff line
@@ -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/asm-generic/vmlinux.lds.h

+2 −0
Original line number Diff line number Diff line
@@ -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()					\

include/linux/clockchips.h

+1 −1
Original line number Diff line number Diff line
@@ -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