Skip to content

Commit 69b73e9

Browse files
committed
um/time: Fixup namespace collision
The new timer_setup() function for struct timer_list collides with a private um function. Rename it. Fixes: 686fef9 ("timer: Prepare to change timer callback argument type") Signed-off-by: Thomas Gleixner <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Jeff Dike <[email protected]> Cc: [email protected] Cc: Kees Cook <[email protected]>
1 parent 686fef9 commit 69b73e9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/um/kernel/time.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static struct clocksource timer_clocksource = {
9898
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
9999
};
100100

101-
static void __init timer_setup(void)
101+
static void __init um_timer_setup(void)
102102
{
103103
int err;
104104

@@ -132,5 +132,5 @@ void read_persistent_clock(struct timespec *ts)
132132
void __init time_init(void)
133133
{
134134
timer_set_signal_handler();
135-
late_time_init = timer_setup;
135+
late_time_init = um_timer_setup;
136136
}

0 commit comments

Comments
 (0)