[PATCH -tip] perf_counter/x86: Fix incorrect default branch

From: Yong Wang
Date: Tue Jun 09 2009 - 04:03:29 EST


The event selector and UMASK values of Nehalem do not apply to all Intel processors.

Signed-off-by: Yong Wang <yong.y.wang@xxxxxxxxx>

---
arch/x86/kernel/cpu/perf_counter.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 56001fe..c74b6d1 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -1413,7 +1413,6 @@ static int intel_pmu_init(void)

pr_cont("Core2 events, ");
break;
- default:
case 26:
memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids,
sizeof(hw_cache_event_ids));
@@ -1426,6 +1425,8 @@ static int intel_pmu_init(void)

pr_cont("Atom events, ");
break;
+ default:
+ break;
}
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/