===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pctr/pctr.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/pctr/pctr.c	2007/10/17 02:30:23	1.13
--- src/usr.bin/pctr/pctr.c	2007/10/17 11:33:55	1.14
***************
*** 1,4 ****
! /*	$OpenBSD: pctr.c,v 1.13 2007/10/17 02:30:23 deraadt Exp $	*/
  
  /*
   * Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev
--- 1,4 ----
! /*	$OpenBSD: pctr.c,v 1.14 2007/10/17 11:33:55 deraadt Exp $	*/
  
  /*
   * Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev
***************
*** 288,294 ****
  	case CPU_P6:
  		cfnp = p6fn;
  	case CPU_CORE:
! 		cfnp = corefn;
  		fn = sel & 0xff;
  		if ((ind = pctr_ctrfn_index(cfnp, fn)) < 0)
  			msg = "unknown function";
--- 288,295 ----
  	case CPU_P6:
  		cfnp = p6fn;
  	case CPU_CORE:
! 		if (cpu_type == CPU_CORE)
! 			cfnp = corefn;
  		fn = sel & 0xff;
  		if ((ind = pctr_ctrfn_index(cfnp, fn)) < 0)
  			msg = "unknown function";
***************
*** 313,320 ****
  		    sel & PCTR_X86_U ? 'u' : '-',
  		    fn, (sel >> PCTR_X86_UM_SHIFT) & 0xff, th, um, msg);
  		break;
- 
- 		break;
  	case CPU_AMD:
  		fn = sel & 0xff;
  		if (sel >> PCTR_X86_CM_SHIFT)
--- 314,319 ----
***************
*** 467,473 ****
  	case CPU_P6:
  		cfnp = p6fn;
  	case CPU_CORE:
! 		cfnp = corefn;
  		if (ctr >= PCTR_INTEL_NUM)
  			return (EX_DATAERR);
  		if (func && (ind = pctr_ctrfn_index(cfnp, func)) < 0)
--- 466,473 ----
  	case CPU_P6:
  		cfnp = p6fn;
  	case CPU_CORE:
! 		if (cpu_type == CPU_CORE)
! 			cfnp = corefn;
  		if (ctr >= PCTR_INTEL_NUM)
  			return (EX_DATAERR);
  		if (func && (ind = pctr_ctrfn_index(cfnp, func)) < 0)