From 11dbd95c06c584c22a31cf544bdba61f45208c7a Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Wed, 29 Jun 2011 04:54:00 +0000
Subject: [PATCH] --- yaml --- r: 259153 b: refs/heads/master c:
 77c2342a578c11f22a1003e641f50d138dd9833a h: refs/heads/master i:   259151:
 a7c242d73d6cb9af024011ff00c82b2f21d65d89 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/kernel/mpc7450-pmu.c | 2 +-
 trunk/arch/powerpc/kernel/perf_event.c  | 2 +-
 trunk/arch/powerpc/kernel/power4-pmu.c  | 2 +-
 trunk/arch/powerpc/kernel/power5+-pmu.c | 2 +-
 trunk/arch/powerpc/kernel/power5-pmu.c  | 2 +-
 trunk/arch/powerpc/kernel/power6-pmu.c  | 2 +-
 trunk/arch/powerpc/kernel/power7-pmu.c  | 2 +-
 trunk/arch/powerpc/kernel/ppc970-pmu.c  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index b7992ac25fa7..4166ed6a1681 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e0ebdb9c2ba7b56a82ba36d29ab3d8cb99de9e7
+refs/heads/master: 77c2342a578c11f22a1003e641f50d138dd9833a
diff --git a/trunk/arch/powerpc/kernel/mpc7450-pmu.c b/trunk/arch/powerpc/kernel/mpc7450-pmu.c
index 2cc5e0301d0b..a6de23d5ef41 100644
--- a/trunk/arch/powerpc/kernel/mpc7450-pmu.c
+++ b/trunk/arch/powerpc/kernel/mpc7450-pmu.c
@@ -405,7 +405,7 @@ struct power_pmu mpc7450_pmu = {
 	.cache_events		= &mpc7450_cache_events,
 };
 
-static int init_mpc7450_pmu(void)
+static int __init init_mpc7450_pmu(void)
 {
 	if (!cur_cpu_spec->oprofile_cpu_type ||
 	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
diff --git a/trunk/arch/powerpc/kernel/perf_event.c b/trunk/arch/powerpc/kernel/perf_event.c
index 822f63008ae1..31ab78f3bee4 100644
--- a/trunk/arch/powerpc/kernel/perf_event.c
+++ b/trunk/arch/powerpc/kernel/perf_event.c
@@ -1408,7 +1408,7 @@ power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu
 	return NOTIFY_OK;
 }
 
-int register_power_pmu(struct power_pmu *pmu)
+int __cpuinit register_power_pmu(struct power_pmu *pmu)
 {
 	if (ppmu)
 		return -EBUSY;		/* something's already registered */
diff --git a/trunk/arch/powerpc/kernel/power4-pmu.c b/trunk/arch/powerpc/kernel/power4-pmu.c
index ead8b3c2649e..4eb709501396 100644
--- a/trunk/arch/powerpc/kernel/power4-pmu.c
+++ b/trunk/arch/powerpc/kernel/power4-pmu.c
@@ -604,7 +604,7 @@ static struct power_pmu power4_pmu = {
 	.cache_events		= &power4_cache_events,
 };
 
-static int init_power4_pmu(void)
+static int __init init_power4_pmu(void)
 {
 	if (!cur_cpu_spec->oprofile_cpu_type ||
 	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4"))
diff --git a/trunk/arch/powerpc/kernel/power5+-pmu.c b/trunk/arch/powerpc/kernel/power5+-pmu.c
index eca0ac595cb6..23aaadbc729c 100644
--- a/trunk/arch/powerpc/kernel/power5+-pmu.c
+++ b/trunk/arch/powerpc/kernel/power5+-pmu.c
@@ -672,7 +672,7 @@ static struct power_pmu power5p_pmu = {
 	.cache_events		= &power5p_cache_events,
 };
 
-static int init_power5p_pmu(void)
+static int __init init_power5p_pmu(void)
 {
 	if (!cur_cpu_spec->oprofile_cpu_type ||
 	    (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+")
diff --git a/trunk/arch/powerpc/kernel/power5-pmu.c b/trunk/arch/powerpc/kernel/power5-pmu.c
index d5ff0f64a5e6..589e49af8e72 100644
--- a/trunk/arch/powerpc/kernel/power5-pmu.c
+++ b/trunk/arch/powerpc/kernel/power5-pmu.c
@@ -612,7 +612,7 @@ static struct power_pmu power5_pmu = {
 	.cache_events		= &power5_cache_events,
 };
 
-static int init_power5_pmu(void)
+static int __init init_power5_pmu(void)
 {
 	if (!cur_cpu_spec->oprofile_cpu_type ||
 	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5"))
diff --git a/trunk/arch/powerpc/kernel/power6-pmu.c b/trunk/arch/powerpc/kernel/power6-pmu.c
index 31603927e376..e13dcda4fa98 100644
--- a/trunk/arch/powerpc/kernel/power6-pmu.c
+++ b/trunk/arch/powerpc/kernel/power6-pmu.c
@@ -535,7 +535,7 @@ static struct power_pmu power6_pmu = {
 	.cache_events		= &power6_cache_events,
 };
 
-static int init_power6_pmu(void)
+static int __init init_power6_pmu(void)
 {
 	if (!cur_cpu_spec->oprofile_cpu_type ||
 	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6"))
diff --git a/trunk/arch/powerpc/kernel/power7-pmu.c b/trunk/arch/powerpc/kernel/power7-pmu.c
index 593740fcb799..81230400843c 100644
--- a/trunk/arch/powerpc/kernel/power7-pmu.c
+++ b/trunk/arch/powerpc/kernel/power7-pmu.c
@@ -360,7 +360,7 @@ static struct power_pmu power7_pmu = {
 	.cache_events		= &power7_cache_events,
 };
 
-static int init_power7_pmu(void)
+static int __init init_power7_pmu(void)
 {
 	if (!cur_cpu_spec->oprofile_cpu_type ||
 	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7"))
diff --git a/trunk/arch/powerpc/kernel/ppc970-pmu.c b/trunk/arch/powerpc/kernel/ppc970-pmu.c
index 9a6e093858fe..45d787920991 100644
--- a/trunk/arch/powerpc/kernel/ppc970-pmu.c
+++ b/trunk/arch/powerpc/kernel/ppc970-pmu.c
@@ -484,7 +484,7 @@ static struct power_pmu ppc970_pmu = {
 	.cache_events		= &ppc970_cache_events,
 };
 
-static int init_ppc970_pmu(void)
+static int __init init_ppc970_pmu(void)
 {
 	if (!cur_cpu_spec->oprofile_cpu_type ||
 	    (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")