From b72a684aa8cc1f7fe42db6ad465dc986e8090d63 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Mar 2010 21:46:37 +0900
Subject: [PATCH] --- yaml --- r: 191590 b: refs/heads/master c:
 2e733b3f84fa9c2ae60513c5f7b56d599ed2ae02 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/arch/sh/kernel/clkdev.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 11754434eb75..b2e2eb4eafa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51a5006afcd13176276f0935ee57c4cc6f210e83
+refs/heads/master: 2e733b3f84fa9c2ae60513c5f7b56d599ed2ae02
diff --git a/trunk/arch/sh/kernel/clkdev.c b/trunk/arch/sh/kernel/clkdev.c
index 29cd802ac388..defdd6e30908 100644
--- a/trunk/arch/sh/kernel/clkdev.c
+++ b/trunk/arch/sh/kernel/clkdev.c
@@ -20,6 +20,9 @@
 #include <linux/string.h>
 #include <linux/mutex.h>
 #include <linux/clk.h>
+#include <linux/slab.h>
+#include <linux/bootmem.h>
+#include <linux/mm.h>
 #include <asm/clock.h>
 #include <asm/clkdev.h>
 
@@ -103,12 +106,16 @@ struct clk_lookup_alloc {
 	char	con_id[MAX_CON_ID];
 };
 
-struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
-	const char *dev_fmt, ...)
+struct clk_lookup * __init_refok
+clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
 {
 	struct clk_lookup_alloc *cla;
 
-	cla = kzalloc(sizeof(*cla), GFP_KERNEL);
+	if (!slab_is_available())
+		cla = alloc_bootmem_low_pages(sizeof(*cla));
+	else
+		cla = kzalloc(sizeof(*cla), GFP_KERNEL);
+
 	if (!cla)
 		return NULL;