From owner-svn-src-head@freebsd.org Wed Aug 14 20:58:40 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B608ABB2AB; Wed, 14 Aug 2019 20:58:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46824J3sjyz3yQn; Wed, 14 Aug 2019 20:58:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B3EB5D54; Wed, 14 Aug 2019 20:58:40 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7EKwe2g092490; Wed, 14 Aug 2019 20:58:40 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7EKwduj092486; Wed, 14 Aug 2019 20:58:39 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201908142058.x7EKwduj092486@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 14 Aug 2019 20:58:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351051 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 351051 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Aug 2019 20:58:40 -0000 Author: imp Date: Wed Aug 14 20:58:39 2019 New Revision: 351051 URL: https://svnweb.freebsd.org/changeset/base/351051 Log: Windows ndis support is x86 only. Move the MI parts there. Reviewed by: jhb (verbal OK on irc) Differential Revision: https://reviews.freebsd.org/D21248 Modified: head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/conf/files.x86 Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Wed Aug 14 20:58:34 2019 (r351050) +++ head/sys/conf/files.amd64 Wed Aug 14 20:58:39 2019 (r351051) @@ -444,16 +444,6 @@ compat/linux/linux_event.c optional compat_linux32 compat/linux/linux.c optional compat_linux32 dev/amr/amr_linux.c optional compat_linux32 amr dev/mfi/mfi_linux.c optional compat_linux32 mfi -# -# Windows NDIS driver support -# -compat/ndis/kern_ndis.c optional ndisapi pci -compat/ndis/kern_windrv.c optional ndisapi pci -compat/ndis/subr_hal.c optional ndisapi pci -compat/ndis/subr_ndis.c optional ndisapi pci -compat/ndis/subr_ntoskrnl.c optional ndisapi pci -compat/ndis/subr_pe.c optional ndisapi pci -compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx64_wrap.S optional ndisapi pci # # x86 real mode BIOS emulator, required by dpms/pci/vesa Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Wed Aug 14 20:58:34 2019 (r351050) +++ head/sys/conf/files.i386 Wed Aug 14 20:58:39 2019 (r351051) @@ -84,13 +84,6 @@ compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux compat/linux/linux_vdso.c optional compat_linux compat/linux/linux.c optional compat_linux -compat/ndis/kern_ndis.c optional ndisapi pci -compat/ndis/kern_windrv.c optional ndisapi pci -compat/ndis/subr_hal.c optional ndisapi pci -compat/ndis/subr_ndis.c optional ndisapi pci -compat/ndis/subr_ntoskrnl.c optional ndisapi pci -compat/ndis/subr_pe.c optional ndisapi pci -compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci bf_enc.o optional crypto | ipsec | ipsec_support \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ Modified: head/sys/conf/files.x86 ============================================================================== --- head/sys/conf/files.x86 Wed Aug 14 20:58:34 2019 (r351050) +++ head/sys/conf/files.x86 Wed Aug 14 20:58:39 2019 (r351051) @@ -20,6 +20,13 @@ cddl/dev/dtrace/x86/instr_size.c optional dtrace_fbt cddl/dev/fbt/x86/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}" cddl/dev/dtrace/x86/dis_tables.c optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}" cddl/dev/dtrace/x86/instr_size.c optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}" +compat/ndis/kern_ndis.c optional ndisapi pci +compat/ndis/kern_windrv.c optional ndisapi pci +compat/ndis/subr_hal.c optional ndisapi pci +compat/ndis/subr_ndis.c optional ndisapi pci +compat/ndis/subr_ntoskrnl.c optional ndisapi pci +compat/ndis/subr_pe.c optional ndisapi pci +compat/ndis/subr_usbd.c optional ndisapi pci crypto/aesni/aesni.c optional aesni aesni_ghash.o optional aesni \ dependency "$S/crypto/aesni/aesni_ghash.c" \