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

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

diff --combined include/asm-generic/vmlinux.lds.h
index f9f21e2,8c6b525..7cdfe16
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -173,6 -173,7 +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)
@@@ -260,9 -261,9 +261,9 @@@
   */
  #ifndef RO_AFTER_INIT_DATA
  #define RO_AFTER_INIT_DATA                                            \
 -      __start_data_ro_after_init = .;                                 \
 +      __start_ro_after_init = .;                                      \
        *(.data..ro_after_init)                                         \
 -      __end_data_ro_after_init = .;
 +      __end_ro_after_init = .;
  #endif
  
  /*
@@@ -559,6 -560,7 +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()                                      \