From 6a01f94d93327d9e1163e86e65fa9d313a9a8d26 Mon Sep 17 00:00:00 2001 From: zrj Date: Tue, 19 Dec 2017 18:27:54 +0200 Subject: [PATCH] kernel/pc64: Mark cpu_type as hardcoded. We currently mark all x86_64 cpus as CPU_CLAWHAMMER. --- sys/platform/pc64/x86_64/initcpu.c | 2 +- sys/platform/pc64/x86_64/machdep.c | 2 +- sys/platform/vkernel64/x86_64/cpu_regs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/platform/pc64/x86_64/initcpu.c b/sys/platform/pc64/x86_64/initcpu.c index 3b825f8ac3..6b2153ee4a 100644 --- a/sys/platform/pc64/x86_64/initcpu.c +++ b/sys/platform/pc64/x86_64/initcpu.c @@ -47,7 +47,7 @@ static int hw_instruction_sse; SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD, &hw_instruction_sse, 0, "SIMD/MMX2 instructions available in CPU"); -int cpu_type; /* Are we 386, 386sx, 486, etc? */ +int cpu_type; /* XXX CPU_CLAWHAMMER */ u_int cpu_feature; /* Feature flags */ u_int cpu_feature2; /* Feature flags */ u_int amd_feature; /* AMD feature flags */ diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c index 9fd9d00e56..afc338a537 100644 --- a/sys/platform/pc64/x86_64/machdep.c +++ b/sys/platform/pc64/x86_64/machdep.c @@ -1453,7 +1453,7 @@ SYSCTL_PROC(_machdep, OID_AUTO, efi_map, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0, efi_map_sysctl_handler, "S,efi_map_header", "Raw EFI Memory Map"); /* - * Initialize 386 and configure to run kernel + * Initialize x86 and configure to run kernel */ /* diff --git a/sys/platform/vkernel64/x86_64/cpu_regs.c b/sys/platform/vkernel64/x86_64/cpu_regs.c index 5ddc3fd6c1..871d6a0ef3 100644 --- a/sys/platform/vkernel64/x86_64/cpu_regs.c +++ b/sys/platform/vkernel64/x86_64/cpu_regs.c @@ -656,7 +656,7 @@ SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW, &adjkerntz, 0, sysctl_machdep_adjkerntz, "I", ""); /* - * Initialize 386 and configure to run kernel + * Initialize x86 and configure to run kernel */ /* -- 2.11.4.GIT