diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-09-29 10:07:44 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-09-29 10:07:44 +0200 |
| commit | 69b73e95982649a1f2dc63b8f08f2113d28f7fed (patch) | |
| tree | 8dadab28913f5d7deaa8702ced67ee37e6b01227 | |
| parent | timer: Prepare to change timer callback argument type (diff) | |
| download | linux-69b73e95982649a1f2dc63b8f08f2113d28f7fed.tar.xz linux-69b73e95982649a1f2dc63b8f08f2113d28f7fed.zip | |
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>
| -rw-r--r-- | arch/um/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 0b034ebbda2a..7f69d17de354 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -98,7 +98,7 @@ static struct clocksource timer_clocksource = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static void __init timer_setup(void) +static void __init um_timer_setup(void) { int err; @@ -132,5 +132,5 @@ void read_persistent_clock(struct timespec *ts) void __init time_init(void) { timer_set_signal_handler(); - late_time_init = timer_setup; + late_time_init = um_timer_setup; } |