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;