From b554bc07d0fb3f7fad25a561aa93b6272034a0e9 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Thu, 14 Jan 2010 17:03:49 +0100
Subject: [PATCH] --- yaml --- r: 188356 b: refs/heads/master c:
 a84642a339235020e6dccc022de27055f1fa9340 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/microblaze/include/asm/system.h |  3 +++
 trunk/arch/microblaze/mm/init.c            | 23 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a9431c0c87ed..4503f6aacc02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2549edd353196d7de9c18e08146d7a8836f97235
+refs/heads/master: a84642a339235020e6dccc022de27055f1fa9340
diff --git a/trunk/arch/microblaze/include/asm/system.h b/trunk/arch/microblaze/include/asm/system.h
index 157970688b2a..59efb3fef957 100644
--- a/trunk/arch/microblaze/include/asm/system.h
+++ b/trunk/arch/microblaze/include/asm/system.h
@@ -87,6 +87,9 @@ void free_initmem(void);
 extern char *klimit;
 extern void ret_from_fork(void);
 
+extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
+extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
+
 #ifdef CONFIG_DEBUG_FS
 extern struct dentry *of_debugfs_root;
 #endif
diff --git a/trunk/arch/microblaze/mm/init.c b/trunk/arch/microblaze/mm/init.c
index a57cedf36715..6eea5544ad8b 100644
--- a/trunk/arch/microblaze/mm/init.c
+++ b/trunk/arch/microblaze/mm/init.c
@@ -349,4 +349,27 @@ void __init *early_get_page(void)
 	}
 	return p;
 }
+
+void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
+{
+	if (mem_init_done)
+		return kmalloc(size, mask);
+	else
+		return alloc_bootmem(size);
+}
+
+void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
+{
+	void *p;
+
+	if (mem_init_done)
+		p = kzalloc(size, mask);
+	else {
+		p = alloc_bootmem(size);
+		if (p)
+			memset(p, 0, size);
+	}
+	return p;
+}
+
 #endif /* CONFIG_MMU */