From owner-svn-src-head@freebsd.org Wed Nov 18 13:47:12 2020 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 0738E2EFFBA; Wed, 18 Nov 2020 13:47:12 +0000 (UTC) (envelope-from hselasky@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4CbkdC6rMKz3QNS; Wed, 18 Nov 2020 13:47:11 +0000 (UTC) (envelope-from hselasky@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 DCB6212DE8; Wed, 18 Nov 2020 13:47:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AIDlBrB079531; Wed, 18 Nov 2020 13:47:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AIDlBPr079529; Wed, 18 Nov 2020 13:47:11 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202011181347.0AIDlBPr079529@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 18 Nov 2020 13:47:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367789 - in head/sys/compat/linuxkpi/common/include: asm linux X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head/sys/compat/linuxkpi/common/include: asm linux X-SVN-Commit-Revision: 367789 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.34 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, 18 Nov 2020 13:47:12 -0000 Author: hselasky Date: Wed Nov 18 13:47:11 2020 New Revision: 367789 URL: https://svnweb.freebsd.org/changeset/base/367789 Log: Allow LinuxKPI types to be used in bootloaders, by checking for the _STANDALONE definition. No functional change intended. MFC after: 1 week Sponsored by: Mellanox Technologies // NVIDIA Networking Modified: head/sys/compat/linuxkpi/common/include/asm/types.h head/sys/compat/linuxkpi/common/include/linux/types.h Modified: head/sys/compat/linuxkpi/common/include/asm/types.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/types.h Wed Nov 18 13:45:32 2020 (r367788) +++ head/sys/compat/linuxkpi/common/include/asm/types.h Wed Nov 18 13:47:11 2020 (r367789) @@ -31,7 +31,7 @@ #ifndef _ASM_TYPES_H_ #define _ASM_TYPES_H_ -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_STANDALONE) #include @@ -59,6 +59,6 @@ typedef vm_paddr_t dma64_addr_t; typedef unsigned short umode_t; -#endif /* _KERNEL */ +#endif /* _KERNEL || _STANDALONE */ #endif /* _ASM_TYPES_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/types.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/types.h Wed Nov 18 13:45:32 2020 (r367788) +++ head/sys/compat/linuxkpi/common/include/linux/types.h Wed Nov 18 13:47:11 2020 (r367789) @@ -57,8 +57,10 @@ typedef uint16_t __aligned_u16 __aligned(sizeof(uint16 typedef uint32_t __aligned_u32 __aligned(sizeof(uint32_t)); typedef uint64_t __aligned_u64 __aligned(sizeof(uint64_t)); +#ifdef _KERNEL typedef unsigned short ushort; typedef unsigned int uint; +#endif typedef unsigned long ulong; typedef unsigned gfp_t; typedef off_t loff_t; @@ -67,7 +69,7 @@ typedef uint16_t __bitwise__ __sum16; typedef unsigned long pgoff_t; typedef unsigned __poll_t; -typedef u64 phys_addr_t; +typedef uint64_t phys_addr_t; typedef size_t __kernel_size_t;