diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-03-07 05:21:41 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-03-07 05:21:41 +0000 |
| commit | 1989834b6e8a0f809bd451da55ba5783bd337d96 (patch) | |
| tree | 060c2949a98848b9e1aa181737d02f74b452b6b8 | |
| parent | 66a07359631e2429593678c4a6f47c58b640b885 (diff) | |
It does not make sense to check for IA64 CPUID flag here.
ok deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/identcpu.c | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/include/specialreg.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c index e786ccc7eb6..e66a1f8d3e3 100644 --- a/sys/arch/amd64/amd64/identcpu.c +++ b/sys/arch/amd64/amd64/identcpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identcpu.c,v 1.6 2005/08/20 00:33:59 jsg Exp $ */ +/* $OpenBSD: identcpu.c,v 1.7 2006/03/07 05:21:40 jsg Exp $ */ /* $NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /* @@ -81,7 +81,6 @@ const struct { { CPUID_SS, "SS" }, { CPUID_HTT, "HTT" }, { CPUID_TM, "TM" }, - { CPUID_IA64, "IA64" }, { CPUID_SBF, "SBF" } }, cpu_ecpuid_features[] = { { CPUID_MPC, "MPC" }, diff --git a/sys/arch/amd64/include/specialreg.h b/sys/arch/amd64/include/specialreg.h index 28d41c00473..c4a044c9aa4 100644 --- a/sys/arch/amd64/include/specialreg.h +++ b/sys/arch/amd64/include/specialreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: specialreg.h,v 1.4 2005/12/13 00:18:19 jsg Exp $ */ +/* $OpenBSD: specialreg.h,v 1.5 2006/03/07 05:21:40 jsg Exp $ */ /* $NetBSD: specialreg.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $ */ /* $NetBSD: x86/specialreg.h,v 1.2 2003/04/25 21:54:30 fvdl Exp $ */ @@ -119,7 +119,7 @@ #define CPUID_SS 0x08000000 /* self-snoop */ #define CPUID_HTT 0x10000000 /* Hyper-Threading Technology */ #define CPUID_TM 0x20000000 /* thermal monitor (TCC) */ -#define CPUID_IA64 0x40000000 /* IA-64 architecture */ +#define CPUID_B30 0x40000000 /* reserved */ #define CPUID_SBF 0x80000000 /* signal break on FERR */ #define CPUIDECX_SSE3 0x00000001 /* streaming SIMD extensions #3 */ |