perf_event, x86: Annotate init functions and data
Subsystems (2)
PATCH 1/1 perf_event, x86: Annotate init functions and data
From: Hiroshi Shimamoto <[email protected]>
Annotate init functions and data with __init and __initconst.
Signed-off-by Hiroshi Shimamoto <[email protected]>
--- arch/x86/kernel/cpu/perf_event.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
arch/x86/kernel/cpu/perf_event.c +10 -10
@@ -245,7 +245,7 @@ static u64 __read_mostly hw_cache_event_ids [PERF_COUNT_HW_CACHE_OP_MAX] [PERF_COUNT_HW_CACHE_RESULT_MAX ]; -static const u64 nehalem_hw_cache_event_ids +static __initconst u64 nehalem_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -336,7 +336,7 @@ static const u64 nehalem_hw_cache_event_ids }, }; -static const u64 core2_hw_cache_event_ids +static __initconst u64 core2_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -427,7 +427,7 @@ static const u64 core2_hw_cache_event_ids }, }; -static const u64 atom_hw_cache_event_ids +static __initconst u64 atom_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -536,7 +536,7 @@ static u64 intel_pmu_raw_event(u64 hw_event)return hw_event &CORE_EVNTSEL_MASK ; } -static const u64 amd_hw_cache_event_ids +static __initconst u64 amd_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -1964,7 +1964,7 @@ static __read_mostly struct notifier_block perf_event_nmi_notifier = { .priority = 1 }; -static struct x86_pmu p6_pmu = { +static __initconst struct x86_pmu p6_pmu = { .name ="p6" , .handle_irq = p6_pmu_handle_irq, .disable_all = p6_pmu_disable_all,
@@ -1992,7 +1992,7 @@ static struct x86_pmu p6_pmu = { .get_event_idx = intel_get_event_idx, }; -static struct x86_pmu intel_pmu = { +static __initconst struct x86_pmu intel_pmu = { .name ="Intel" , .handle_irq = intel_pmu_handle_irq, .disable_all = intel_pmu_disable_all,
@@ -2016,7 +2016,7 @@ static struct x86_pmu intel_pmu = { .get_event_idx = intel_get_event_idx, }; -static struct x86_pmu amd_pmu = { +static __initconst struct x86_pmu amd_pmu = { .name ="AMD" , .handle_irq = amd_pmu_handle_irq, .disable_all = amd_pmu_disable_all,
@@ -2037,7 +2037,7 @@ static struct x86_pmu amd_pmu = { .get_event_idx = gen_get_event_idx, }; -static int p6_pmu_init (void ) +static __init int p6_pmu_init (void ) {switch (boot_cpu_data.x86_model) {case 1 :
@@ -2071,7 +2071,7 @@ static int p6_pmu_init(void)return 0 ; } -static int intel_pmu_init (void ) +static __init int intel_pmu_init (void ) {union cpuid10_edx edx;union cpuid10_eax eax;
@@ -2144,7 +2144,7 @@ static int intel_pmu_init(void)return 0 ; } -static int amd_pmu_init (void ) +static __init int amd_pmu_init (void ) {/* Performance-monitoring supported from K7 and later: */ if (boot_cpu_data.x86 <6 )
Signature · 1 line
1.6.3.3
Commit-ID: db48cccc7c709ccfa7cb4ac702bc27c216bffee7 Gitweb: http://git.kernel.org/tip/db48cccc7c709ccfa7cb4ac702bc27c216bffee7 Author: Hiroshi Shimamoto <[email protected]> AuthorDate: Thu, 12 Nov 2009 11:25:34 +0900 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 12 Nov 2009 09:18:36 +0100
perf_event, x86: Annotate init functions and data
Annotate init functions and data with __init and __initconst.
Signed-off-by Hiroshi Shimamoto <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
arch/x86/kernel/cpu/perf_event.c +10 -10
@@ -245,7 +245,7 @@ static u64 __read_mostly hw_cache_event_ids [PERF_COUNT_HW_CACHE_OP_MAX] [PERF_COUNT_HW_CACHE_RESULT_MAX ]; -static const u64 nehalem_hw_cache_event_ids +static __initconst u64 nehalem_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -336,7 +336,7 @@ static const u64 nehalem_hw_cache_event_ids }, }; -static const u64 core2_hw_cache_event_ids +static __initconst u64 core2_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -427,7 +427,7 @@ static const u64 core2_hw_cache_event_ids }, }; -static const u64 atom_hw_cache_event_ids +static __initconst u64 atom_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -536,7 +536,7 @@ static u64 intel_pmu_raw_event(u64 hw_event)return hw_event &CORE_EVNTSEL_MASK ; } -static const u64 amd_hw_cache_event_ids +static __initconst u64 amd_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -1964,7 +1964,7 @@ static __read_mostly struct notifier_block perf_event_nmi_notifier = { .priority = 1 }; -static struct x86_pmu p6_pmu = { +static __initconst struct x86_pmu p6_pmu = { .name ="p6" , .handle_irq = p6_pmu_handle_irq, .disable_all = p6_pmu_disable_all,
@@ -1992,7 +1992,7 @@ static struct x86_pmu p6_pmu = { .get_event_idx = intel_get_event_idx, }; -static struct x86_pmu intel_pmu = { +static __initconst struct x86_pmu intel_pmu = { .name ="Intel" , .handle_irq = intel_pmu_handle_irq, .disable_all = intel_pmu_disable_all,
@@ -2016,7 +2016,7 @@ static struct x86_pmu intel_pmu = { .get_event_idx = intel_get_event_idx, }; -static struct x86_pmu amd_pmu = { +static __initconst struct x86_pmu amd_pmu = { .name ="AMD" , .handle_irq = amd_pmu_handle_irq, .disable_all = amd_pmu_disable_all,
@@ -2037,7 +2037,7 @@ static struct x86_pmu amd_pmu = { .get_event_idx = gen_get_event_idx, }; -static int p6_pmu_init (void ) +static __init int p6_pmu_init (void ) {switch (boot_cpu_data.x86_model) {case 1 :
@@ -2071,7 +2071,7 @@ static int p6_pmu_init(void)return 0 ; } -static int intel_pmu_init (void ) +static __init int intel_pmu_init (void ) {union cpuid10_edx edx;union cpuid10_eax eax;
@@ -2144,7 +2144,7 @@ static int intel_pmu_init(void)return 0 ; } -static int amd_pmu_init (void ) +static __init int amd_pmu_init (void ) {/* Performance-monitoring supported from K7 and later: */ if (boot_cpu_data.x86 <6 )