From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752291AbbKQKh0 (ORCPT ); Tue, 17 Nov 2015 05:37:26 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38435 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750913AbbKQKhW (ORCPT ); Tue, 17 Nov 2015 05:37:22 -0500 Date: Tue, 17 Nov 2015 02:37:05 -0800 From: tip-bot for Arnd Bergmann Message-ID: Cc: arnd@arndb.de, mingo@kernel.org, linux-kernel@vger.kernel.org, daniel.lezcano@linaro.org, tglx@linutronix.de, balbi@ti.com, hpa@zytor.com, tony@atomide.com Reply-To: tony@atomide.com, hpa@zytor.com, balbi@ti.com, tglx@linutronix.de, daniel.lezcano@linaro.org, mingo@kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de In-Reply-To: <7579471.4N90fYPQOK@wuerfel> References: <7579471.4N90fYPQOK@wuerfel> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET Git-Commit-ID: 3da6d49e847128378c30292848125cc3e207e5f7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3da6d49e847128378c30292848125cc3e207e5f7 Gitweb: http://git.kernel.org/tip/3da6d49e847128378c30292848125cc3e207e5f7 Author: Arnd Bergmann AuthorDate: Mon, 16 Nov 2015 17:51:17 +0100 Committer: Thomas Gleixner CommitDate: Mon, 16 Nov 2015 19:07:08 +0100 clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET We can now select clocksource drivers like ti-32k and CONFIG_OF on ancient machines that still use gettimeoffset, and the combination results in a link error. arch/arm/kernel/built-in.o: In function `time_init': (.init.text+0xc28): undefined reference to `clocksource_probe' The reason for this is that the Makefile is hidden behind CONFIG_ARCH_USES_GETTIMEOFFSET, but the Kconfig file is not, and it has shown up just now because the ti-32k driver was added and can be selected using COMPILE_TEST on all platforms. This patch hides the Kconfig menu in CONFIG_ARCH_USES_GETTIMEOFFSET as well. Fixes: dfedaf105d60 "clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE" Signed-off-by: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Cc: Felipe Balbi Cc: Tony Lindgren Cc: Daniel Lezcano Link: http://lkml.kernel.org/r/7579471.4N90fYPQOK@wuerfel Signed-off-by: Thomas Gleixner --- drivers/clocksource/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 71cfdf7..2eb5f0e 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -1,4 +1,5 @@ menu "Clock Source drivers" + depends on !ARCH_USES_GETTIMEOFFSET config CLKSRC_OF bool