From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Nov 2017 18:37:16 +0000 (-1000)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=844056fd74ebdd826bd23a7d989597e15f478acb;p=linux.git

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

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
   code.

 - 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
  ...
---

844056fd74ebdd826bd23a7d989597e15f478acb
diff --cc security/keys/gc.c
index 6713fee893fb5,b93603724b8c0..7207e6094dc16
--- a/security/keys/gc.c
+++ b/security/keys/gc.c
@@@ -29,10 -29,10 +29,10 @@@ DECLARE_WORK(key_gc_work, key_garbage_c
  /*
   * Reaper for links from keyrings to dead keys.
   */
- static void key_gc_timer_func(unsigned long);
+ static void key_gc_timer_func(struct timer_list *);
  static DEFINE_TIMER(key_gc_timer, key_gc_timer_func);
  
 -static time_t key_gc_next_run = LONG_MAX;
 +static time64_t key_gc_next_run = TIME64_MAX;
  static struct key_type *key_gc_dead_keytype;
  
  static unsigned long key_gc_flags;
@@@ -84,10 -84,10 +84,10 @@@ void key_schedule_gc_links(void
   * Some key's cleanup time was met after it expired, so we need to get the
   * reaper to go through a cycle finding expired keys.
   */
- static void key_gc_timer_func(unsigned long data)
+ static void key_gc_timer_func(struct timer_list *unused)
  {
  	kenter("");
 -	key_gc_next_run = LONG_MAX;
 +	key_gc_next_run = TIME64_MAX;
  	key_schedule_gc_links();
  }