From 17f684b34480fe943bf772b489d83e7bbd8676e0 Mon Sep 17 00:00:00 2001
From: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Mon, 7 Nov 2011 13:29:56 +0000
Subject: [PATCH] --- yaml --- r: 282061 b: refs/heads/master c:
 6c9b7c409ca2840ba589a869c48e641b40966e30 h: refs/heads/master i:   282059:
 77a4716b91eb8a25017d8d0f3b6fe632d04bd6bb v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/kvm/book3s_hv_builtin.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d845374caef6..724f93f4baf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 222d21aa070a4885ce3c7125a1b7ce07429ea4a1
+refs/heads/master: 6c9b7c409ca2840ba589a869c48e641b40966e30
diff --git a/trunk/arch/powerpc/kvm/book3s_hv_builtin.c b/trunk/arch/powerpc/kvm/book3s_hv_builtin.c
index 286f13d601cf..a795a13f4a70 100644
--- a/trunk/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/trunk/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -86,7 +86,7 @@ static inline int lpcr_rmls(unsigned long rma_size)
  * to allocate contiguous physical memory for the real memory
  * areas for guests.
  */
-void kvm_rma_init(void)
+void __init kvm_rma_init(void)
 {
 	unsigned long i;
 	unsigned long j, npages;