Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Apr 2021 08:04:08 GMT
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f5209bef0f61 - stable/13 - Get rid of i386 ref here as linux64 is a 64-bit module.
Message-ID:  <202104010804.131848X8043903@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin:

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

commit f5209bef0f6103d3ccc2380d438e85a8a8367e52
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2021-03-24 15:56:46 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2021-04-01 08:03:35 +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 ebc69168bd4a..c081151e3fc5 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104010804.131848X8043903>