The branch stable/12 has been updated by dchagin:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=6fab8f9b8ae7a2f5489191714393494c88bd937b

commit 6fab8f9b8ae7a2f5489191714393494c88bd937b
Author:     Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2021-03-24 15:56:46 +0000
Commit:     Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2021-06-10 09:29:21 +0000

    Get rid of i386 ref here as linux64 is a 64-bit module.
    
    Reviewed By:            emaste, imp
    Differential Revision:  https://reviews.freebsd.org/D29412
    
    (cherry picked from commit 88588c4b7611a39cdf965c3c07d8fcc13ed553b4)
---
 sys/modules/linux64/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile
index ec1aee563aa3..3730c019c559 100644
--- a/sys/modules/linux64/Makefile
+++ b/sys/modules/linux64/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/${MACHINE}/linux
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
 .PATH: ${SRCTOP}/sys/x86/linux
 .endif
 
@@ -16,16 +16,13 @@ SRCS=       linux_fork.c linux_dummy_machdep.c linux_file.c 
linux_event.c \
        opt_compat.h opt_inet6.h opt_posix.h opt_usb.h \
        vnode_if.h device_if.h bus_if.h \
        linux_support.s
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
 SRCS+= linux_dummy_x86.c
 .endif
 DPSRCS=        assym.inc linux_genassym.c
 
 # XXX: for assym.inc
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
-.if ${MACHINE_CPUARCH} == "i386"
-SRCS+= opt_apic.h
-.endif
 
 CLEANFILES=    linux_assym.h linux_genassym.o linux_locore.o \
                genassym.o
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"

Reply via email to