diff options
-rw-r--r-- | arch/x86/events/intel/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 7c666958a625..ad08caf1a1b6 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c | |||
@@ -177,7 +177,7 @@ static struct event_constraint intel_slm_event_constraints[] __read_mostly = | |||
177 | EVENT_CONSTRAINT_END | 177 | EVENT_CONSTRAINT_END |
178 | }; | 178 | }; |
179 | 179 | ||
180 | struct event_constraint intel_skl_event_constraints[] = { | 180 | static struct event_constraint intel_skl_event_constraints[] = { |
181 | FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */ | 181 | FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */ |
182 | FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */ | 182 | FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */ |
183 | FIXED_EVENT_CONSTRAINT(0x0300, 2), /* CPU_CLK_UNHALTED.REF */ | 183 | FIXED_EVENT_CONSTRAINT(0x0300, 2), /* CPU_CLK_UNHALTED.REF */ |
@@ -225,12 +225,12 @@ EVENT_ATTR_STR(mem-loads, mem_ld_nhm, "event=0x0b,umask=0x10,ldlat=3"); | |||
225 | EVENT_ATTR_STR(mem-loads, mem_ld_snb, "event=0xcd,umask=0x1,ldlat=3"); | 225 | EVENT_ATTR_STR(mem-loads, mem_ld_snb, "event=0xcd,umask=0x1,ldlat=3"); |
226 | EVENT_ATTR_STR(mem-stores, mem_st_snb, "event=0xcd,umask=0x2"); | 226 | EVENT_ATTR_STR(mem-stores, mem_st_snb, "event=0xcd,umask=0x2"); |
227 | 227 | ||
228 | struct attribute *nhm_events_attrs[] = { | 228 | static struct attribute *nhm_events_attrs[] = { |
229 | EVENT_PTR(mem_ld_nhm), | 229 | EVENT_PTR(mem_ld_nhm), |
230 | NULL, | 230 | NULL, |
231 | }; | 231 | }; |
232 | 232 | ||
233 | struct attribute *snb_events_attrs[] = { | 233 | static struct attribute *snb_events_attrs[] = { |
234 | EVENT_PTR(mem_ld_snb), | 234 | EVENT_PTR(mem_ld_snb), |
235 | EVENT_PTR(mem_st_snb), | 235 | EVENT_PTR(mem_st_snb), |
236 | NULL, | 236 | NULL, |
@@ -258,7 +258,7 @@ static struct event_constraint intel_hsw_event_constraints[] = { | |||
258 | EVENT_CONSTRAINT_END | 258 | EVENT_CONSTRAINT_END |
259 | }; | 259 | }; |
260 | 260 | ||
261 | struct event_constraint intel_bdw_event_constraints[] = { | 261 | static struct event_constraint intel_bdw_event_constraints[] = { |
262 | FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */ | 262 | FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */ |
263 | FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */ | 263 | FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */ |
264 | FIXED_EVENT_CONSTRAINT(0x0300, 2), /* CPU_CLK_UNHALTED.REF */ | 264 | FIXED_EVENT_CONSTRAINT(0x0300, 2), /* CPU_CLK_UNHALTED.REF */ |