aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2009-04-29 06:47:00 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-29 08:51:01 -0400
commit4138960a9251a265002b5cf07e671a49f8495381 (patch)
tree7c2be16434955c87146911193329f1baef4b0f63
parent829b42dd395c5801f6ae87da87ecbdcfd5ef1a6c (diff)
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>
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c2
1 files changed, 2 insertions, 0 deletions
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)
997 case X86_VENDOR_AMD: 997 case X86_VENDOR_AMD:
998 pmc_ops = pmc_amd_init(); 998 pmc_ops = pmc_amd_init();
999 break; 999 break;
1000 default:
1001 return;
1000 } 1002 }
1001 if (!pmc_ops) 1003 if (!pmc_ops)
1002 return; 1004 return;