Deleted Added
full compact
hwpmc_intel.c (187761) hwpmc_intel.c (200669)
1/*-
2 * Copyright (c) 2008 Joseph Koshy
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * SUCH DAMAGE.
25 */
26
27/*
28 * Common code for handling Intel CPUs.
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008 Joseph Koshy
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * SUCH DAMAGE.
25 */
26
27/*
28 * Common code for handling Intel CPUs.
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_intel.c 187761 2009-01-27 07:29:37Z jeff $");
32__FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_intel.c 200669 2009-12-18 15:01:46Z jkoshy $");
33
34#include <sys/param.h>
35#include <sys/pmc.h>
36#include <sys/pmckern.h>
37#include <sys/systm.h>
38
39#include <machine/cpu.h>
40#include <machine/cputypes.h>

--- 85 unchanged lines hidden (view full) ---

126 cputype = PMC_CPU_INTEL_CORE2EXTREME;
127 nclasses = 3;
128 break;
129 case 0x1C: /* Per Intel document 320047-002. */
130 cputype = PMC_CPU_INTEL_ATOM;
131 nclasses = 3;
132 break;
133 case 0x1A:
33
34#include <sys/param.h>
35#include <sys/pmc.h>
36#include <sys/pmckern.h>
37#include <sys/systm.h>
38
39#include <machine/cpu.h>
40#include <machine/cputypes.h>

--- 85 unchanged lines hidden (view full) ---

126 cputype = PMC_CPU_INTEL_CORE2EXTREME;
127 nclasses = 3;
128 break;
129 case 0x1C: /* Per Intel document 320047-002. */
130 cputype = PMC_CPU_INTEL_ATOM;
131 nclasses = 3;
132 break;
133 case 0x1A:
134 case 0x1E: /* Per Intel document 253669-032 9/2009, pages A-2 and A-57 */
135 case 0x1F: /* Per Intel document 253669-032 9/2009, pages A-2 and A-57 */
134 cputype = PMC_CPU_INTEL_COREI7;
135 nclasses = 3;
136 break;
137 }
138 break;
139#if defined(__i386__) || defined(__amd64__)
140 case 0xF00: /* P4 */
141 if (model >= 0 && model <= 6) /* known models */

--- 129 unchanged lines hidden ---
136 cputype = PMC_CPU_INTEL_COREI7;
137 nclasses = 3;
138 break;
139 }
140 break;
141#if defined(__i386__) || defined(__amd64__)
142 case 0xF00: /* P4 */
143 if (model >= 0 && model <= 6) /* known models */

--- 129 unchanged lines hidden ---