diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2015-07-16 23:04:13 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2015-07-16 23:04:13 +0000 |
| commit | 29f767abddc05c7a57dd8767a422682e033883c1 (patch) | |
| tree | 77fc4df28f4dc8e49ff3bee1cc05c9bd0a849871 /sys/arch/amd64 | |
| parent | 7e7ea7e7fd1746fde299b6e5c7e5be2f9301c5bb (diff) | |
remove 'cpu_brand_id' as we no longer use that method to calculate the
name of the cpu. Further, the calculation of cpu_brand_id was in the
wrong place to begin with, so it was being calculated incorrectly anyway.
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/locore.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S index 8bd302d1435..ad7885533d0 100644 --- a/sys/arch/amd64/amd64/locore.S +++ b/sys/arch/amd64/amd64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.69 2015/07/16 21:12:12 mlarkin Exp $ */ +/* $OpenBSD: locore.S,v 1.70 2015/07/16 23:04:12 mlarkin Exp $ */ /* $NetBSD: locore.S,v 1.13 2004/03/25 18:33:17 drochner Exp $ */ /* @@ -167,7 +167,7 @@ _C_LABEL(lapic_isr): .space NBPG-LAPIC_ISR #endif - .globl _C_LABEL(cpu_id),_C_LABEL(cpu_vendor), _C_LABEL(cpu_brand_id) + .globl _C_LABEL(cpu_id),_C_LABEL(cpu_vendor) .globl _C_LABEL(cpuid_level),_C_LABEL(cpu_feature) .globl _C_LABEL(cpu_ecxfeature),_C_LABEL(ecpu_ecxfeature) .globl _C_LABEL(cpu_perf_eax) @@ -195,7 +195,6 @@ _C_LABEL(cpuid_level): .long -1 # max. level accepted by 'cpuid' # instruction _C_LABEL(cpu_vendor): .space 16 # vendor string returned by `cpuid' # instruction -_C_LABEL(cpu_brand_id): .long 0 # brand ID from 'cpuid' instruction _C_LABEL(ssym): .quad 0 # ptr to start of syms _C_LABEL(esym): .quad 0 # ptr to end of syms _C_LABEL(atdevbase): .quad 0 # location of start of iomem in virtual @@ -353,10 +352,6 @@ cont: cpuid movl %edx,RELOC(_C_LABEL(cpu_apmi_edx)) - /* Brand ID is bits 0-7 of %ebx */ - andl $255,%ebx - movl %ebx,RELOC(cpu_brand_id) - /* * Finished with old stack; load new %esp now instead of later so we * can trace this code without having to worry about the trace trap |