From 7eec2e024bf7457ac7b68c7b5c24530167ca0e09 Mon Sep 17 00:00:00 2001
From: Li Zhong <zhong@linux.vnet.ibm.com>
Date: Thu, 7 Jun 2012 17:44:23 +0000
Subject: [PATCH] --- yaml --- r: 311497 b: refs/heads/master c:
 2cb387ae758d97ee7396a82528c824b8dc510b8a h: refs/heads/master i:   311495:
 1d6cce2aebd69197f523d1f2fce2707988697b9e v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/kernel/prom_init.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7e756911917b..4d8dc0a4a7f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c58ce2b1e3c75c55e7ebf751afce9f5a30f60b42
+refs/heads/master: 2cb387ae758d97ee7396a82528c824b8dc510b8a
diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c
index 1b488e5305c5..0794a3017b1b 100644
--- a/trunk/arch/powerpc/kernel/prom_init.c
+++ b/trunk/arch/powerpc/kernel/prom_init.c
@@ -1312,7 +1312,7 @@ static struct opal_secondary_data {
 
 extern char opal_secondary_entry;
 
-static void prom_query_opal(void)
+static void __init prom_query_opal(void)
 {
 	long rc;
 
@@ -1436,7 +1436,7 @@ static void __init prom_opal_hold_cpus(void)
 	prom_debug("prom_opal_hold_cpus: end...\n");
 }
 
-static void prom_opal_takeover(void)
+static void __init prom_opal_takeover(void)
 {
 	struct opal_secondary_data *data = &RELOC(opal_secondary_data);
 	struct opal_takeover_args *args = &data->args;