ia64/xen-unstable

changeset 16954:1b4fa085bec6

Small fix for VMX Core2 perfctr access.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jan 31 09:41:32 2008 +0000 (2008-01-31)
parents 475f4323b86a
children c4a06902febf
files xen/arch/x86/oprofile/nmi_int.c
line diff
     1.1 --- a/xen/arch/x86/oprofile/nmi_int.c	Thu Jan 31 09:39:44 2008 +0000
     1.2 +++ b/xen/arch/x86/oprofile/nmi_int.c	Thu Jan 31 09:41:32 2008 +0000
     1.3 @@ -291,13 +291,15 @@ static int __init p4_init(char ** cpu_ty
     1.4  }
     1.5  
     1.6  
     1.7 +extern int ppro_has_global_ctrl;
     1.8  static int __init ppro_init(char ** cpu_type)
     1.9  {
    1.10  	__u8 cpu_model = current_cpu_data.x86_model;
    1.11  
    1.12 -	if (cpu_model == 15 || cpu_model == 23)
    1.13 +	if (cpu_model == 15 || cpu_model == 23) {
    1.14  		*cpu_type = "i386/core_2";
    1.15 -	else if (cpu_model == 14)
    1.16 +		ppro_has_global_ctrl = 1;
    1.17 +	} else if (cpu_model == 14)
    1.18  		*cpu_type = "i386/core";
    1.19  	else if (cpu_model > 13) {
    1.20  		printk("xenoprof: Initialization failed. "