From db0f8b5e40c2d9c7641cc2747019d42a94f4db3b Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@mcmartin.ca>
Date: Thu, 18 Oct 2007 00:03:45 -0700
Subject: [PATCH] --- yaml --- r: 71908 b: refs/heads/master c:
 730e844d57693f464c7f9954a0f7102414164c3f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/parisc/kernel/time.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 76104e128f69..9084428965ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efb80e7e097d0888e59fbbe4ded2ac5a256f556d
+refs/heads/master: 730e844d57693f464c7f9954a0f7102414164c3f
diff --git a/trunk/arch/parisc/kernel/time.c b/trunk/arch/parisc/kernel/time.c
index 8b3062a5c812..24be86bba94d 100644
--- a/trunk/arch/parisc/kernel/time.c
+++ b/trunk/arch/parisc/kernel/time.c
@@ -189,16 +189,14 @@ static struct clocksource clocksource_cr16 = {
 #ifdef CONFIG_SMP
 int update_cr16_clocksource(void)
 {
-	int change = 0;
-
 	/* since the cr16 cycle counters are not synchronized across CPUs,
 	   we'll check if we should switch to a safe clocksource: */
 	if (clocksource_cr16.rating != 0 && num_online_cpus() > 1) {
 		clocksource_change_rating(&clocksource_cr16, 0);
-		change = 1;
+		return 1;
 	}
 
-	return change;
+	return 0;
 }
 #else
 int update_cr16_clocksource(void)