summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2006-07-12 06:04:12 +0000
committerjkim <jkim@FreeBSD.org>2006-07-12 06:04:12 +0000
commit3117fa3da4d89744ddfe45c3ac759ab430bd2950 (patch)
treecbad3428f0d4beef862f5a9e06f7245742ddc9f6
parente5ba465043d7678368b0320e4ce23b2954a41920 (diff)
downloadFreeBSD-src-3117fa3da4d89744ddfe45c3ac759ab430bd2950.zip
FreeBSD-src-3117fa3da4d89744ddfe45c3ac759ab430bd2950.tar.gz
Add two new CPUID bits for AMD CPUs, i. e., SVM and extended APIC register.
-rw-r--r--sys/amd64/amd64/identcpu.c4
-rw-r--r--sys/amd64/include/specialreg.h2
-rw-r--r--sys/i386/i386/identcpu.c4
-rw-r--r--sys/i386/include/specialreg.h2
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index a8ad392..f413fb5 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -306,8 +306,8 @@ printcpuinfo(void)
"\020"
"\001LAHF" /* LAHF/SAHF in long mode */
"\002CMP" /* CMP legacy */
- "\003<b2>"
- "\004<b3>"
+ "\003SVM" /* Secure Virtual Mode */
+ "\004ExtAPIC" /* Extended APIC register */
"\005CR8" /* CR8 in legacy mode */
"\006<b5>"
"\007<b6>"
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index 24db7da..7adc83d 100644
--- a/sys/amd64/include/specialreg.h
+++ b/sys/amd64/include/specialreg.h
@@ -135,6 +135,8 @@
#define AMDID2_LAHF 0x00000001
#define AMDID2_CMP 0x00000002
+#define AMDID2_SVM 0x00000004
+#define AMDID2_EXT_APIC 0x00000008
#define AMDID2_CR8 0x00000010
/*
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index aff022f..2f0be09 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -813,8 +813,8 @@ printcpuinfo(void)
"\020"
"\001LAHF" /* LAHF/SAHF in long mode */
"\002CMP" /* CMP legacy */
- "\003<b2>"
- "\004<b3>"
+ "\003SVM" /* Secure Virtual Mode */
+ "\004ExtAPIC" /* Extended APIC register */
"\005CR8" /* CR8 in legacy mode */
"\006<b5>"
"\007<b6>"
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index 6fd492c..8c8cd0d 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -122,6 +122,8 @@
#define AMDID2_LAHF 0x00000001
#define AMDID2_CMP 0x00000002
+#define AMDID2_SVM 0x00000004
+#define AMDID2_EXT_APIC 0x00000008
#define AMDID2_CR8 0x00000010
/*
OpenPOWER on IntegriCloud