• Linus Torvalds's avatar
    Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 844056fd
    Linus Torvalds authored
    Pull timer updates from Thomas Gleixner:
     - The final conversion of timer wheel timers to timer_setup().
       A few manual conversions and a large coccinelle assisted sweep and
       the removal of the old initialization mechanisms and the related
     - Remove the now unused VSYSCALL update code
     - Fix permissions of /proc/timer_list. I still need to get rid of that
       file completely
     - Rename a misnomed clocksource function and remove a stale declaration
    * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
      m68k/macboing: Fix missed timer callback assignment
      treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts
      timer: Remove redundant __setup_timer*() macros
      timer: Pass function down to initialization routines
      timer: Remove unused data arguments from macros
      timer: Switch callback prototype to take struct timer_list * argument
      timer: Pass timer_list pointer to callbacks unconditionally
      Coccinelle: Remove setup_timer.cocci
      timer: Remove setup_*timer() interface
      timer: Remove init_timer() interface
      treewide: setup_timer() -> timer_setup() (2 field)
      treewide: setup_timer() -> timer_setup()
      treewide: init_timer() -> setup_timer()
      treewide: Switch DEFINE_TIMER callbacks to struct timer_list *
      s390: cmm: Convert timers to use timer_setup()
      lightnvm: Convert timers to use timer_setup()
      drivers/net: cris: Convert timers to use timer_setup()
      drm/vc4: Convert timers to use timer_setup()
      block/laptop_mode: Convert timers to use timer_setup()
      net/atm/mpc: Avoid open-coded assignment of timer callback function