[tip:timers/urgent 1/1] arch/um/kernel/time.c:101:20: error: conflicting types for 'timer_setup'

[kbuild test robot]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/urgent
head:   686fef928bba6be13cabe639f154af7d72b63120
commit: 686fef928bba6be13cabe639f154af7d72b63120 [1/1] timer: Prepare to change timer callback argument type
config: um-x86_64_defconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        git checkout 686fef928bba6be13cabe639f154af7d72b63120
        # save the attached .config to linux build tree
        make ARCH=um SUBARCH=x86_64

All errors (new ones prefixed by >>):

>> arch/um/kernel/time.c:101:20: error: conflicting types for 'timer_setup'
    static void __init timer_setup(void)
                       ^~~~~~~~~~~
   In file included from include/linux/clocksource.h:16:0,
                    from include/linux/clockchips.h:13,
                    from arch/um/kernel/time.c:9:
   include/linux/timer.h:174:20: note: previous definition of 'timer_setup' was here
    static inline void timer_setup(struct timer_list *timer,
                       ^~~~~~~~~~~

vim +/timer_setup +101 arch/um/kernel/time.c

791a644a8 arch/um/kernel/time.c      Jeff Dike    2007-10-16  100  
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02 @101  static void __init timer_setup(void)
aceb34346 arch/um/kernel/time_kern.c Jeff Dike    2006-07-10  102  {
aceb34346 arch/um/kernel/time_kern.c Jeff Dike    2006-07-10  103  	int err;
aceb34346 arch/um/kernel/time_kern.c Jeff Dike    2006-07-10  104  
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  105  	err = request_irq(TIMER_IRQ, um_timer, IRQF_TIMER, "hr timer", NULL);
aceb34346 arch/um/kernel/time_kern.c Jeff Dike    2006-07-10  106  	if (err != 0)
537ae946e arch/um/kernel/time.c      Jeff Dike    2006-09-25  107  		printk(KERN_ERR "register_timer : request_irq failed - "
aceb34346 arch/um/kernel/time_kern.c Jeff Dike    2006-07-10  108  		       "errno = %d\n", -err);
aceb34346 arch/um/kernel/time_kern.c Jeff Dike    2006-07-10  109  
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  110  	err = os_timer_create(NULL);
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  111  	if (err != 0) {
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  112  		printk(KERN_ERR "creation of timer failed - errno = %d\n", -err);
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  113  		return;
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  114  	}
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  115  
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  116  	err = clocksource_register_hz(&timer_clocksource, NSEC_PER_SEC/TIMER_MULTIPLIER);
791a644a8 arch/um/kernel/time.c      Jeff Dike    2007-10-16  117  	if (err) {
60d687e7d arch/um/kernel/time.c      John Stultz  2010-04-26  118  		printk(KERN_ERR "clocksource_register_hz returned %d\n", err);
791a644a8 arch/um/kernel/time.c      Jeff Dike    2007-10-16  119  		return;
791a644a8 arch/um/kernel/time.c      Jeff Dike    2007-10-16  120  	}
2eb5f31bc arch/um/kernel/time.c      Anton Ivanov 2015-11-02  121  	clockevents_register_device(&timer_clockevent);
aceb34346 arch/um/kernel/time_kern.c Jeff Dike    2006-07-10  122  }
aceb34346 arch/um/kernel/time_kern.c Jeff Dike    2006-07-10  123  

:::::: The code at line 101 was first introduced by commit
:::::: 2eb5f31bc4ea24bb293e82934cfa1cce9573304b um: Switch clocksource to hrtimers

:::::: TO: Anton Ivanov <aivanov@xxxxxxxxxxx>
:::::: CC: Richard Weinberger <richard@xxxxxx>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Attachment: .config.gz
Description: application/gzip