diff --git a/[refs] b/[refs] index b8c3e6e8d86b..9d4e28940c54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc65ac6a0ffc66c56d1e6893685d7fe87c63cc44 +refs/heads/master: 51d8c5edd3b166fcc51aba84d78761d578400a7c diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c index 726caf9a0a69..b650f04888ed 100644 --- a/trunk/kernel/timer.c +++ b/trunk/kernel/timer.c @@ -84,7 +84,7 @@ typedef struct tvec_t_base_s tvec_base_t; tvec_base_t boot_tvec_bases; EXPORT_SYMBOL(boot_tvec_bases); -static DEFINE_PER_CPU(tvec_base_t *, tvec_bases) = { &boot_tvec_bases }; +static DEFINE_PER_CPU(tvec_base_t *, tvec_bases) = &boot_tvec_bases; static inline void set_running_timer(tvec_base_t *base, struct timer_list *timer)