Skip to content

Commit 066ce64

Browse files
minipliIngo Molnar
authored andcommitted
perf/x86/intel: Mark initialization code as such
A few of the initialization functions are missing the __init annotation. Fix this and thereby allow ~680 additional bytes of code to be released after initialization. Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: x86@kernel.org Link: http://lkml.kernel.org/r/1409071785-26015-1-git-send-email-minipli@googlemail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 70691d4 commit 066ce64

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arch/x86/kernel/cpu/perf_event_intel_ds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)
10141014
* BTS, PEBS probe and setup
10151015
*/
10161016

1017-
void intel_ds_init(void)
1017+
void __init intel_ds_init(void)
10181018
{
10191019
/*
10201020
* No support for 32bit formats

arch/x86/kernel/cpu/perf_event_intel_lbr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ static const int snb_lbr_sel_map[PERF_SAMPLE_BRANCH_MAX] = {
697697
};
698698

699699
/* core */
700-
void intel_pmu_lbr_init_core(void)
700+
void __init intel_pmu_lbr_init_core(void)
701701
{
702702
x86_pmu.lbr_nr = 4;
703703
x86_pmu.lbr_tos = MSR_LBR_TOS;
@@ -712,7 +712,7 @@ void intel_pmu_lbr_init_core(void)
712712
}
713713

714714
/* nehalem/westmere */
715-
void intel_pmu_lbr_init_nhm(void)
715+
void __init intel_pmu_lbr_init_nhm(void)
716716
{
717717
x86_pmu.lbr_nr = 16;
718718
x86_pmu.lbr_tos = MSR_LBR_TOS;
@@ -733,7 +733,7 @@ void intel_pmu_lbr_init_nhm(void)
733733
}
734734

735735
/* sandy bridge */
736-
void intel_pmu_lbr_init_snb(void)
736+
void __init intel_pmu_lbr_init_snb(void)
737737
{
738738
x86_pmu.lbr_nr = 16;
739739
x86_pmu.lbr_tos = MSR_LBR_TOS;
@@ -753,7 +753,7 @@ void intel_pmu_lbr_init_snb(void)
753753
}
754754

755755
/* atom */
756-
void intel_pmu_lbr_init_atom(void)
756+
void __init intel_pmu_lbr_init_atom(void)
757757
{
758758
/*
759759
* only models starting at stepping 10 seems

0 commit comments

Comments
 (0)