Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755605AbbFUSEG (ORCPT ); Sun, 21 Jun 2015 14:04:06 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41568 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751810AbbFUSD6 (ORCPT ); Sun, 21 Jun 2015 14:03:58 -0400 Date: Sun, 21 Jun 2015 11:03:35 -0700 From: tip-bot for Paul Gortmaker Message-ID: Cc: hpa@zytor.com, daniel.lezcano@linaro.org, cw00.choi@samsung.com, paul.gortmaker@windriver.com, mingo@kernel.org, linus.walleij@linaro.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mcoquelin.stm32@gmail.com Reply-To: daniel.lezcano@linaro.org, hpa@zytor.com, cw00.choi@samsung.com, mingo@kernel.org, paul.gortmaker@windriver.com, linus.walleij@linaro.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mcoquelin.stm32@gmail.com In-Reply-To: <1434841352-24300-1-git-send-email-paul.gortmaker@windriver.com> References: <1434841352-24300-1-git-send-email-paul.gortmaker@windriver.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] clocksource: Increase dependencies of timer-stm32 to limit build wreckage Git-Commit-ID: 1cb6c2151850584ee805fdcf088af0bb81f4b086 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 Content-Length: 2922 Lines: 58 Commit-ID: 1cb6c2151850584ee805fdcf088af0bb81f4b086 Gitweb: http://git.kernel.org/tip/1cb6c2151850584ee805fdcf088af0bb81f4b086 Author: Paul Gortmaker AuthorDate: Sat, 20 Jun 2015 19:02:32 -0400 Committer: Thomas Gleixner CommitDate: Sun, 21 Jun 2015 20:01:48 +0200 clocksource: Increase dependencies of timer-stm32 to limit build wreckage This driver leaks out into arch/parisc builds that don't have CONFIG_GENERIC_CLOCKEVENTS, leading to the following (truncated) wreckage: CC drivers/clocksource/timer-stm32.o drivers/clocksource/timer-stm32.c:38:28: error: field 'evtdev' has incomplete type drivers/clocksource/timer-stm32.c:44:19: warning: 'enum clock_event_mode' declared inside parameter list drivers/clocksource/timer-stm32.c:44:19: warning: its scope is only this definition or declaration, which is probably not what you want drivers/clocksource/timer-stm32.c:43:62: error: parameter 1 ('mode') has incomplete type drivers/clocksource/timer-stm32.c:43:13: error: function declaration isn't a prototype drivers/clocksource/timer-stm32.c: In function 'stm32_clock_event_set_mode': drivers/clocksource/timer-stm32.c:47:3: error: type defaults to 'int' in declaration of '__mptr' drivers/clocksource/timer-stm32.c:47:3: warning: initialization from incompatible pointer type drivers/clocksource/timer-stm32.c:51:7: error: 'CLOCK_EVT_MODE_PERIODIC' undeclared (first use in this function) drivers/clocksource/timer-stm32.c:51:7: note: each undeclared identifier is reported only once for each function it appears in drivers/clocksource/timer-stm32.c:56:7: error: 'CLOCK_EVT_MODE_ONESHOT' undeclared (first use in this function) Tighten up the dependencies to limit where it gets built by copying the style of the Kconfig line for CLKSRC_EFM32 a few lines above. Signed-off-by: Paul Gortmaker Cc: Linus Walleij Cc: Chanwoo Choi Cc: Maxime Coquelin Cc: Daniel Lezcano Link: http://lkml.kernel.org/r/1434841352-24300-1-git-send-email-paul.gortmaker@windriver.com Signed-off-by: Thomas Gleixner --- drivers/clocksource/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index bec25b3..32164ba 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -112,8 +112,8 @@ config CLKSRC_LPC32XX select CLKSRC_OF config CLKSRC_STM32 - bool "Clocksource for STM32 SoCs" if COMPILE_TEST - depends on OF + bool "Clocksource for STM32 SoCs" if !ARCH_STM32 + depends on OF && ARM && (ARCH_STM32 || COMPILE_TEST) select CLKSRC_MMIO config ARM_ARCH_TIMER -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/