diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-06-29 00:54:00 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-19 01:12:40 -0400 |
commit | 77c2342a578c11f22a1003e641f50d138dd9833a (patch) | |
tree | 65a67c30f51063f7b06ec3c810276687c6c3c65b /arch/powerpc/kernel | |
parent | 0e0ebdb9c2ba7b56a82ba36d29ab3d8cb99de9e7 (diff) |
powerpc: Correct annotations of pmu registration functions
This fixes the following warning:
WARNING: arch/powerpc/kernel/built-in.o(.text+0x29768): Section mismatch in reference from the function .register_power_pmu() to the function .cpuinit.text:.power_pmu_notifier()
The function .register_power_pmu() references
the function __cpuinit .power_pmu_notifier().
This is often because .register_power_pmu lacks a __cpuinit
annotation or the annotation of .power_pmu_notifier is wrong.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/mpc7450-pmu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/perf_event.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/power4-pmu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/power5+-pmu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/power5-pmu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/power6-pmu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/power7-pmu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/ppc970-pmu.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/mpc7450-pmu.c b/arch/powerpc/kernel/mpc7450-pmu.c index 2cc5e0301d0b..a6de23d5ef41 100644 --- a/arch/powerpc/kernel/mpc7450-pmu.c +++ b/arch/powerpc/kernel/mpc7450-pmu.c | |||
@@ -405,7 +405,7 @@ struct power_pmu mpc7450_pmu = { | |||
405 | .cache_events = &mpc7450_cache_events, | 405 | .cache_events = &mpc7450_cache_events, |
406 | }; | 406 | }; |
407 | 407 | ||
408 | static int init_mpc7450_pmu(void) | 408 | static int __init init_mpc7450_pmu(void) |
409 | { | 409 | { |
410 | if (!cur_cpu_spec->oprofile_cpu_type || | 410 | if (!cur_cpu_spec->oprofile_cpu_type || |
411 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450")) | 411 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450")) |
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c index 822f63008ae1..31ab78f3bee4 100644 --- a/arch/powerpc/kernel/perf_event.c +++ b/arch/powerpc/kernel/perf_event.c | |||
@@ -1408,7 +1408,7 @@ power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu | |||
1408 | return NOTIFY_OK; | 1408 | return NOTIFY_OK; |
1409 | } | 1409 | } |
1410 | 1410 | ||
1411 | int register_power_pmu(struct power_pmu *pmu) | 1411 | int __cpuinit register_power_pmu(struct power_pmu *pmu) |
1412 | { | 1412 | { |
1413 | if (ppmu) | 1413 | if (ppmu) |
1414 | return -EBUSY; /* something's already registered */ | 1414 | return -EBUSY; /* something's already registered */ |
diff --git a/arch/powerpc/kernel/power4-pmu.c b/arch/powerpc/kernel/power4-pmu.c index ead8b3c2649e..4eb709501396 100644 --- a/arch/powerpc/kernel/power4-pmu.c +++ b/arch/powerpc/kernel/power4-pmu.c | |||
@@ -604,7 +604,7 @@ static struct power_pmu power4_pmu = { | |||
604 | .cache_events = &power4_cache_events, | 604 | .cache_events = &power4_cache_events, |
605 | }; | 605 | }; |
606 | 606 | ||
607 | static int init_power4_pmu(void) | 607 | static int __init init_power4_pmu(void) |
608 | { | 608 | { |
609 | if (!cur_cpu_spec->oprofile_cpu_type || | 609 | if (!cur_cpu_spec->oprofile_cpu_type || |
610 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4")) | 610 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4")) |
diff --git a/arch/powerpc/kernel/power5+-pmu.c b/arch/powerpc/kernel/power5+-pmu.c index eca0ac595cb6..23aaadbc729c 100644 --- a/arch/powerpc/kernel/power5+-pmu.c +++ b/arch/powerpc/kernel/power5+-pmu.c | |||
@@ -672,7 +672,7 @@ static struct power_pmu power5p_pmu = { | |||
672 | .cache_events = &power5p_cache_events, | 672 | .cache_events = &power5p_cache_events, |
673 | }; | 673 | }; |
674 | 674 | ||
675 | static int init_power5p_pmu(void) | 675 | static int __init init_power5p_pmu(void) |
676 | { | 676 | { |
677 | if (!cur_cpu_spec->oprofile_cpu_type || | 677 | if (!cur_cpu_spec->oprofile_cpu_type || |
678 | (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+") | 678 | (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+") |
diff --git a/arch/powerpc/kernel/power5-pmu.c b/arch/powerpc/kernel/power5-pmu.c index d5ff0f64a5e6..589e49af8e72 100644 --- a/arch/powerpc/kernel/power5-pmu.c +++ b/arch/powerpc/kernel/power5-pmu.c | |||
@@ -612,7 +612,7 @@ static struct power_pmu power5_pmu = { | |||
612 | .cache_events = &power5_cache_events, | 612 | .cache_events = &power5_cache_events, |
613 | }; | 613 | }; |
614 | 614 | ||
615 | static int init_power5_pmu(void) | 615 | static int __init init_power5_pmu(void) |
616 | { | 616 | { |
617 | if (!cur_cpu_spec->oprofile_cpu_type || | 617 | if (!cur_cpu_spec->oprofile_cpu_type || |
618 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5")) | 618 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5")) |
diff --git a/arch/powerpc/kernel/power6-pmu.c b/arch/powerpc/kernel/power6-pmu.c index 31603927e376..e13dcda4fa98 100644 --- a/arch/powerpc/kernel/power6-pmu.c +++ b/arch/powerpc/kernel/power6-pmu.c | |||
@@ -535,7 +535,7 @@ static struct power_pmu power6_pmu = { | |||
535 | .cache_events = &power6_cache_events, | 535 | .cache_events = &power6_cache_events, |
536 | }; | 536 | }; |
537 | 537 | ||
538 | static int init_power6_pmu(void) | 538 | static int __init init_power6_pmu(void) |
539 | { | 539 | { |
540 | if (!cur_cpu_spec->oprofile_cpu_type || | 540 | if (!cur_cpu_spec->oprofile_cpu_type || |
541 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6")) | 541 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6")) |
diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c index 593740fcb799..81230400843c 100644 --- a/arch/powerpc/kernel/power7-pmu.c +++ b/arch/powerpc/kernel/power7-pmu.c | |||
@@ -360,7 +360,7 @@ static struct power_pmu power7_pmu = { | |||
360 | .cache_events = &power7_cache_events, | 360 | .cache_events = &power7_cache_events, |
361 | }; | 361 | }; |
362 | 362 | ||
363 | static int init_power7_pmu(void) | 363 | static int __init init_power7_pmu(void) |
364 | { | 364 | { |
365 | if (!cur_cpu_spec->oprofile_cpu_type || | 365 | if (!cur_cpu_spec->oprofile_cpu_type || |
366 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7")) | 366 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7")) |
diff --git a/arch/powerpc/kernel/ppc970-pmu.c b/arch/powerpc/kernel/ppc970-pmu.c index 9a6e093858fe..45d787920991 100644 --- a/arch/powerpc/kernel/ppc970-pmu.c +++ b/arch/powerpc/kernel/ppc970-pmu.c | |||
@@ -484,7 +484,7 @@ static struct power_pmu ppc970_pmu = { | |||
484 | .cache_events = &ppc970_cache_events, | 484 | .cache_events = &ppc970_cache_events, |
485 | }; | 485 | }; |
486 | 486 | ||
487 | static int init_ppc970_pmu(void) | 487 | static int __init init_ppc970_pmu(void) |
488 | { | 488 | { |
489 | if (!cur_cpu_spec->oprofile_cpu_type || | 489 | if (!cur_cpu_spec->oprofile_cpu_type || |
490 | (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970") | 490 | (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970") |