From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752650AbbL1SAm (ORCPT ); Mon, 28 Dec 2015 13:00:42 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:42181 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751975AbbL1SA1 (ORCPT ); Mon, 28 Dec 2015 13:00:27 -0500 From: Grygorii Strashko To: , CC: , Sekhar Nori , Grygorii Strashko Subject: [4.4-rc6-rt1 PATCH 2/2] kernel/time/timer.c: UP: fix undefined reference to `del_timer_sync' Date: Mon, 28 Dec 2015 20:00:11 +0200 Message-ID: <1451325611-21678-3-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1451325611-21678-1-git-send-email-grygorii.strashko@ti.com> References: <1451325611-21678-1-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes below build errors in case SMP=n: drivers/built-in.o: In function `fbcon_del_cursor_timer': /home/x0174654/kernel.org/linux-master/linux/drivers/video/console/fbcon.c:433: undefined reference to `del_timer_sync' drivers/built-in.o: In function `sysrq_disconnect': /home/x0174654/kernel.org/linux-master/linux/drivers/tty/sysrq.c:928: undefined reference to `del_timer_sync' drivers/built-in.o: In function `kd_mksound': /home/x0174654/kernel.org/linux-master/linux/drivers/tty/vt/keyboard.c:256: undefined reference to `del_timer_sync' drivers/built-in.o: In function `do_blank_screen': /home/x0174654/kernel.org/linux-master/linux/drivers/tty/vt/vt.c:3842: undefined reference to `del_timer_sync' drivers/built-in.o: In function `univ8250_release_irq': /home/x0174654/kernel.org/linux-master/linux/drivers/tty/serial/8250/8250_core.c:365: undefined reference to `del_timer_sync' drivers/built-in.o:/home/x0174654/kernel.org/linux-master/linux/drivers/base/power/wakeup.c:114: more undefined references to `del_timer_sync' follow Signed-off-by: Grygorii Strashko --- kernel/time/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index c3314fc..a460cbb 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1118,7 +1118,7 @@ int try_to_del_timer_sync(struct timer_list *timer) } EXPORT_SYMBOL(try_to_del_timer_sync); -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL) /** * del_timer_sync - deactivate a timer and wait for the handler to finish. * @timer: the timer to be deactivated -- 2.6.4