From: Robert Richter <robert.richter@amd.com>
Date: Wed, 29 Apr 2009 10:47:00 +0000 (+0200)
Subject: perf_counter, x86: add default path to cpu detection
X-Git-Tag: v2.6.31-rc1~383^2~352
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4138960a9251a265002b5cf07e671a49f8495381;hp=829b42dd395c5801f6ae87da87ecbdcfd5ef1a6c;p=linux-block.git

perf_counter, x86: add default path to cpu detection

This quits hw counter initialization immediately if no cpu is
detected.

[ Impact: cleanup ]

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1241002046-8832-4-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 7d0f81dcb524..d6d6529349dd 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -997,6 +997,8 @@ void __init init_hw_perf_counters(void)
 	case X86_VENDOR_AMD:
 		pmc_ops = pmc_amd_init();
 		break;
+	default:
+		return;
 	}
 	if (!pmc_ops)
 		return;