diff options
| author | jhb <jhb@FreeBSD.org> | 2015-12-23 21:41:42 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2015-12-23 21:41:42 +0000 |
| commit | 994c23f093ffc787a9df3aed34ac0192fd33b5cf (patch) | |
| tree | 947514bb221bd9a1ad294551a0524c73c24648f7 /sys/i386/include/cputypes.h | |
| parent | d94d9ab649132948ef671f5a6b8354c0f895812f (diff) | |
| download | FreeBSD-src-994c23f093ffc787a9df3aed34ac0192fd33b5cf.zip FreeBSD-src-994c23f093ffc787a9df3aed34ac0192fd33b5cf.tar.gz | |
Move shared variables from {amd64,i386}/initcpu.c to x86/identcpu.c.
While here, move the common bits of <machine/cputypes.h> to
<x86/cputypes.h> as well.
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D4670
Diffstat (limited to 'sys/i386/include/cputypes.h')
| -rw-r--r-- | sys/i386/include/cputypes.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h index 718741a..fb0fa47 100644 --- a/sys/i386/include/cputypes.h +++ b/sys/i386/include/cputypes.h @@ -30,6 +30,8 @@ #ifndef _MACHINE_CPUTYPES_H_ #define _MACHINE_CPUTYPES_H_ +#include <x86/cputypes.h> + /* * Classes of processor. */ @@ -61,25 +63,4 @@ #define CPU_P4 16 /* Intel Pentium 4 */ #define CPU_GEODE1100 17 /* NS Geode SC1100 */ -/* - * Vendors of processor. - */ -#define CPU_VENDOR_NSC 0x100b /* NSC */ -#define CPU_VENDOR_IBM 0x1014 /* IBM */ -#define CPU_VENDOR_AMD 0x1022 /* AMD */ -#define CPU_VENDOR_SIS 0x1039 /* SiS */ -#define CPU_VENDOR_UMC 0x1060 /* UMC */ -#define CPU_VENDOR_NEXGEN 0x1074 /* Nexgen */ -#define CPU_VENDOR_CYRIX 0x1078 /* Cyrix */ -#define CPU_VENDOR_IDT 0x111d /* Centaur/IDT/VIA */ -#define CPU_VENDOR_TRANSMETA 0x1279 /* Transmeta */ -#define CPU_VENDOR_INTEL 0x8086 /* Intel */ -#define CPU_VENDOR_RISE 0xdead2bad /* Rise */ -#define CPU_VENDOR_CENTAUR CPU_VENDOR_IDT - -#ifndef LOCORE -extern int cpu; -extern int cpu_class; -#endif - #endif /* !_MACHINE_CPUTYPES_H_ */ |
