OSDN Git Service

(root) / android-x86 / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 686fef9) | patch
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)
commit69b73e95982649a1f2dc63b8f08f2113d28f7fed
tree8dadab28913f5d7deaa8702ced67ee37e6b01227tree | snapshot
parent686fef928bba6be13cabe639f154af7d72b63120commit | diff
um/time: Fixup namespace collision

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

Fixes: 686fef928bba ("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 diff | blob | history
kernel
About OSDN
Find Software
Develop Software
Help