From: Helge Deller <deller@gmx.de>
Date: Tue, 8 Sep 2015 15:49:31 +0000 (+0200)
Subject: parisc: Drop CONFIG_SMP around update_cr16_clocksource()
X-Git-Tag: v4.3-rc1~41^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72581cecee411be2b2c00226c98e0c20aab337a2;p=karo-tx-linux.git

parisc: Drop CONFIG_SMP around update_cr16_clocksource()

No need to use CONFIG_SMP around update_cr16_clocksource(). It checks for
num_online_cpus() beeing greater than 1, which is always 1 in UP builds.

Signed-off-by: Helge Deller <deller@gmx.de>
---

diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 70e105d62423..cc68a4fbce6a 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -202,7 +202,6 @@ static struct clocksource clocksource_cr16 = {
 	.flags			= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-#ifdef CONFIG_SMP
 int update_cr16_clocksource(void)
 {
 	/* since the cr16 cycle counters are not synchronized across CPUs,
@@ -214,12 +213,6 @@ int update_cr16_clocksource(void)
 
 	return 0;
 }
-#else
-int update_cr16_clocksource(void)
-{
-	return 0; /* no change */
-}
-#endif /*CONFIG_SMP*/
 
 void __init start_cpu_itimer(void)
 {