diff options
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/brand/common/brand_asm.h | 5 | ||||
| -rw-r--r-- | usr/src/uts/intel/ia32/ml/float.s | 5 | ||||
| -rw-r--r-- | usr/src/uts/intel/kdi/kdi_idthdl.s | 3 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/driver_aliases | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/usr/src/uts/intel/brand/common/brand_asm.h b/usr/src/uts/intel/brand/common/brand_asm.h index 1d540db2a9..175b98eb7d 100644 --- a/usr/src/uts/intel/brand/common/brand_asm.h +++ b/usr/src/uts/intel/brand/common/brand_asm.h @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. */ #ifndef _COMMON_BRAND_ASM_H @@ -65,7 +66,7 @@ extern "C" { * 24 | saved stack pointer | * | 16 | lwp pointer | * v 8 | user return address | - * 0 | BRAND_CALLBACK()'s return addr | + * 0 | BRAND_CALLBACK()'s return addr | * -------------------------------------- */ @@ -182,7 +183,7 @@ extern "C" { GET_P_BRAND_DATA(SP_REG, 0, scr); /* get p_brand_data */ \ cmp $0, scr; \ je 9f; \ - cmp $0, handler(scr); /* check handler */ \ + cmpq $0, handler(scr); /* check handler */ \ je 9f /* diff --git a/usr/src/uts/intel/ia32/ml/float.s b/usr/src/uts/intel/ia32/ml/float.s index b3c4643707..807647f553 100644 --- a/usr/src/uts/intel/ia32/ml/float.s +++ b/usr/src/uts/intel/ia32/ml/float.s @@ -22,6 +22,7 @@ /* * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, Joyent, Inc. + * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. */ /* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ @@ -262,7 +263,7 @@ */ ENTRY_NP(fpdisable) - STTS(%rdi) /* set TS bit in %cr0 (disable FPU) */ + STTS(%rdi) /* set TS bit in %cr0 (disable FPU) */ ret SET_SIZE(fpdisable) @@ -284,7 +285,7 @@ leaq avx_initial(%rip), %rcx xorl %edx, %edx movl $XFEATURE_AVX, %eax - bt $X86FSET_AVX, x86_featureset + btl $X86FSET_AVX, x86_featureset cmovael %edx, %eax orl $(XFEATURE_LEGACY_FP | XFEATURE_SSE), %eax xrstor (%rcx) diff --git a/usr/src/uts/intel/kdi/kdi_idthdl.s b/usr/src/uts/intel/kdi/kdi_idthdl.s index 77ef433184..9c50f7e23f 100644 --- a/usr/src/uts/intel/kdi/kdi_idthdl.s +++ b/usr/src/uts/intel/kdi/kdi_idthdl.s @@ -23,6 +23,7 @@ * Use is subject to license terms. * * Copyright 2018 Joyent, Inc. + * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. */ /* @@ -71,7 +72,7 @@ pushq %r14; \ subq $KPTI_R14, %rsp; \ /* Check for clobbering */ \ - cmp $0, KPTI_FLAG(%rsp); \ + cmpq $0, KPTI_FLAG(%rsp); \ je 1f; \ /* Don't worry, this totally works */ \ int $8; \ diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases index 73c693018d..a7d3a648a6 100644 --- a/usr/src/uts/intel/os/driver_aliases +++ b/usr/src/uts/intel/os/driver_aliases @@ -1331,6 +1331,8 @@ rge "pci10ec,8168" rge "pci10ec,8169" rge "pci16ec,116" rge "pciex10ec,8136" +rge "pciex10ec,8168" +rge "pciex10ec,8169" rtls "pci10ec,8139" rtls "pci1113,1211" rtls "pci1186,1300" |