Messages in this thread Patch in this message | | | Date | Tue, 29 Jan 2013 01:42:24 -0800 | From | tip-bot for Fengguang Wu <> | Subject | [tip:perf/x86] perf/x86: Mark nhm_events_attrsas static |
| |
Commit-ID: a4a607086d86d1315c4e2d9496bbe502e645bdd1 Gitweb: http://git.kernel.org/tip/a4a607086d86d1315c4e2d9496bbe502e645bdd1 Author: Fengguang Wu <fengguang.wu@intel.com> AuthorDate: Tue, 29 Jan 2013 07:46:20 +0800 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Tue, 29 Jan 2013 08:51:46 +0100
perf/x86: Mark nhm_events_attrsas static
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Acked-by: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/20130128234620.GA8524@localhost Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/kernel/cpu/perf_event_intel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index 9d0d036..bb910bd 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -140,12 +140,12 @@ EVENT_ATTR_STR(mem-loads, mem_ld_nhm, "event=0x0b,umask=0x10,ldlat=3"); EVENT_ATTR_STR(mem-loads, mem_ld_snb, "event=0xcd,umask=0x1,ldlat=3"); EVENT_ATTR_STR(mem-stores, mem_st_snb, "event=0xcd,umask=0x2"); -struct attribute *nhm_events_attrs[] = { +static struct attribute *nhm_events_attrs[] = { EVENT_PTR(mem_ld_nhm), NULL, }; -struct attribute *snb_events_attrs[] = { +static struct attribute *snb_events_attrs[] = { EVENT_PTR(mem_ld_snb), EVENT_PTR(mem_st_snb), NULL,
| |