]> git.baikalelectronics.ru Git - kernel.git/commit
um/time: Fixup namespace collision
authorThomas Gleixner <tglx@linutronix.de>
Fri, 29 Sep 2017 08:07:44 +0000 (10:07 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 29 Sep 2017 08:07:44 +0000 (10:07 +0200)
commit7c6d6f98e37ac33c64ab70bf1f9c6a871848dce5
tree8dadab28913f5d7deaa8702ced67ee37e6b01227
parentb53d0dc736535b327b0efedaebd8714f85d975ce
um/time: Fixup namespace collision

The new timer_setup() function for struct timer_list collides with a
private um function. Rename it.

Fixes: b53d0dc73653 ("timer: Prepare to change timer callback argument type")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Weinberger <richard@nod.at>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: Kees Cook <keescook@chromium.org>
arch/um/kernel/time.c