[Top] [All Lists]

[PATCH] MIPS: Always register R4K clock when selected

To: <>
Subject: [PATCH] MIPS: Always register R4K clock when selected
From: Markos Chandras <>
Date: Mon, 7 Oct 2013 11:32:54 +0100
Cc: "Steven J. Hill" <>, Markos Chandras <>
List-archive: <>
List-help: <>
List-id: linux-mips <>
List-owner: <>
List-post: <>
List-software: Ecartis version 1.0.0
List-subscribe: <>
List-unsubscribe: <>
Original-recipient: rfc822;
From: "Steven J. Hill" <>

Always register the R4K clocksource when CONFIG_CSRC_R4K is selected,
regardless of selected support for other clocksources. The kernel will
select the best clocksource based on their ratings, making it safe to
register R4K unconditionally and use it as a fallback should the
kernel be run on a system where other selected clocksources are

Signed-off-by: Steven J. Hill <>
Signed-off-by: Markos Chandras <>
 arch/mips/include/asm/time.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index 2d7b9df..24f534a 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -75,7 +75,7 @@ extern int init_r4k_clocksource(void);
 static inline int init_mips_clocksource(void)
-#if defined(CONFIG_CSRC_R4K) && !defined(CONFIG_CSRC_GIC)
        return init_r4k_clocksource();
        return 0;

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] MIPS: Always register R4K clock when selected, Markos Chandras <=