From 5e75c89f8dc7c5af2ed030544880f8508f9a9ac9 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Thu, 17 Jul 2008 19:05:54 +0900
Subject: [PATCH] --- yaml --- r: 106855 b: refs/heads/master c:
 152fe36ebee82b63a9c6e510c52aaa82f4b1940d h: refs/heads/master i:   106853:
 2b09254a0a25395206a4f102e7d32c45582f2e67   106851:
 0ee8c01ffd422d4cddd0b211b99e3e7c56c37831   106847:
 38bd6b43301082980f2ba946fddf950d58df6a01 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/sh/kernel/cpu/clock.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 6fe1007fc1e4..3c30011d79a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1312994c8008d66806d9452c15d50df86a031437
+refs/heads/master: 152fe36ebee82b63a9c6e510c52aaa82f4b1940d
diff --git a/trunk/arch/sh/kernel/cpu/clock.c b/trunk/arch/sh/kernel/cpu/clock.c
index 73334c689e9d..f5eb56e6bc59 100644
--- a/trunk/arch/sh/kernel/cpu/clock.c
+++ b/trunk/arch/sh/kernel/cpu/clock.c
@@ -308,15 +308,11 @@ static int show_clocks(char *buf, char **start, off_t off,
 	list_for_each_entry_reverse(clk, &clock_list, node) {
 		unsigned long rate = clk_get_rate(clk);
 
-		/*
-		 * Don't bother listing dummy clocks with no ancestry
-		 * that only support enable and disable ops.
-		 */
-		if (unlikely(!rate && !clk->parent))
-			continue;
-
-		p += sprintf(p, "%-12s\t: %ld.%02ldMHz\n", clk->name,
-			     rate / 1000000, (rate % 1000000) / 10000);
+		p += sprintf(p, "%-12s\t: %ld.%02ldMHz\t%s\n", clk->name,
+			     rate / 1000000, (rate % 1000000) / 10000,
+			     ((clk->flags & CLK_ALWAYS_ENABLED) ||
+			      (atomic_read(&clk->kref.refcount) != 1)) ?
+			     "enabled" : "disabled");
 	}
 
 	return p - buf;