1 files changed, 17 insertions, 18 deletions

diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index ec70d0cce555..353b7a3a2581 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -190,9 +190,9 @@ static struct extra_reg intel_snbep_extra_regs[] __read_mostly = {
         EVENT_EXTRA_END
 };
 
-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");
+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[] = {
         EVENT_PTR(mem_ld_nhm),
@@ -2223,23 +2223,22 @@ static __init void intel_nehalem_quirk(void)
         }
 }
 
-EVENT_ATTR_STR(mem-loads,      mem_ld_hsw,     "event=0xcd,umask=0x1,ldlat=3");
-EVENT_ATTR_STR(mem-stores,     mem_st_hsw,     "event=0xd0,umask=0x82")
+EVENT_ATTR_STR(mem-loads,       mem_ld_hsw,     "event=0xcd,umask=0x1,ldlat=3");
+EVENT_ATTR_STR(mem-stores,      mem_st_hsw,     "event=0xd0,umask=0x82")
 
 /* Haswell special events */
-EVENT_ATTR_STR(tx-start,        tx_start,       "event=0xc9,umask=0x1");
-EVENT_ATTR_STR(tx-commit,       tx_commit,      "event=0xc9,umask=0x2");
-EVENT_ATTR_STR(tx-abort,        tx_abort,       "event=0xc9,umask=0x4");
-EVENT_ATTR_STR(tx-capacity,     tx_capacity,    "event=0x54,umask=0x2");
-EVENT_ATTR_STR(tx-conflict,     tx_conflict,    "event=0x54,umask=0x1");
-EVENT_ATTR_STR(el-start,        el_start,       "event=0xc8,umask=0x1");
-EVENT_ATTR_STR(el-commit,       el_commit,      "event=0xc8,umask=0x2");
-EVENT_ATTR_STR(el-abort,        el_abort,       "event=0xc8,umask=0x4");
-EVENT_ATTR_STR(el-capacity,     el_capacity,    "event=0x54,umask=0x2");
-EVENT_ATTR_STR(el-conflict,     el_conflict,    "event=0x54,umask=0x1");
-EVENT_ATTR_STR(cycles-t,        cycles_t,       "event=0x3c,in_tx=1");
-EVENT_ATTR_STR(cycles-ct,       cycles_ct,
-                                        "event=0x3c,in_tx=1,in_tx_cp=1");
+EVENT_ATTR_STR(tx-start,        tx_start,       "event=0xc9,umask=0x1");
+EVENT_ATTR_STR(tx-commit,       tx_commit,      "event=0xc9,umask=0x2");
+EVENT_ATTR_STR(tx-abort,        tx_abort,       "event=0xc9,umask=0x4");
+EVENT_ATTR_STR(tx-capacity,     tx_capacity,    "event=0x54,umask=0x2");
+EVENT_ATTR_STR(tx-conflict,     tx_conflict,    "event=0x54,umask=0x1");
+EVENT_ATTR_STR(el-start,        el_start,       "event=0xc8,umask=0x1");
+EVENT_ATTR_STR(el-commit,       el_commit,      "event=0xc8,umask=0x2");
+EVENT_ATTR_STR(el-abort,        el_abort,       "event=0xc8,umask=0x4");
+EVENT_ATTR_STR(el-capacity,     el_capacity,    "event=0x54,umask=0x2");
+EVENT_ATTR_STR(el-conflict,     el_conflict,    "event=0x54,umask=0x1");
+EVENT_ATTR_STR(cycles-t,        cycles_t,       "event=0x3c,in_tx=1");
+EVENT_ATTR_STR(cycles-ct,       cycles_ct,      "event=0x3c,in_tx=1,in_tx_cp=1");
 
 static struct attribute *hsw_events_attrs[] = {
         EVENT_PTR(tx_start),