From nobody Thu Feb 16 11:56:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PHYM36ZsHz3q5vQ; Thu, 16 Feb 2023 11:56:31 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PHYM315Ycz4B1n; Thu, 16 Feb 2023 11:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSWTWD9VWIBCgteBHLRYvy6iXHsAqd13h6vWf6tiHa4=; b=kKTTOLioBx058kSQWuMcFWurZavSmfn9a7b0kLBIe7VYREaEKjjcAThKizw+JAgL4Lqu1h 4bFxIVgvLekqPVKyKs7SPTAcd8UUu+RTs3GPvgPfH/uRYm1w51ldq1IbKgV8/5pslewzWd iy4JOPMZAcPJ7ezgrePB05kFMkqenjY/krfcMuz5LaQLr0cgBcf649Gw0IXrTRgvyAFcay vNVO2WrQDtPU9alfUr29U1Ms1WMyUm8pTBOtBmxWdxUptqTK33xpQJ+HWhPDnL1Wccm2Ek R7vUPA3S/1MgaHiShGkrH6F39KeIFMw5pp/qI0wH7sf2QpY/6TSuAsBwTnJGfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kSWTWD9VWIBCgteBHLRYvy6iXHsAqd13h6vWf6tiHa4=; b=KGjMhdVN0zrHydKaTMFRiXvfF85UtnGD5d1hw/NF6C/1cQMmNNbU6AcDquszfFtEv6oqRP g4+d1drNx3ClUECh8wbRgG83MHoo7DMqyzEDyUHP46YQarYoSGVeKml7L+hBOCXT1pZBsI l6HjtTQkmeC9RX38DvhOgwqx3/WdTrDPYd448Kye1pLawHkpU9i+39Sb38ZV4BNs+NW3n0 JgPJHu37cFTGXS3OQy8esrskUOFDjVp5hrVPf7gex9BsQgq4vdhRV4MJUi+I+TWpJsZ4VK pUvfICb3WQG3XG5NOA27qJjraK6ecT4l+fiE4f4Lxdiop+32XuqXeuJlGLRLzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548591; a=rsa-sha256; cv=none; b=XGOlFF9J0W8o+h2adfTr1qo+dEuk4ElPd9Diyk0KxShRKlhs7SDiwOQgZzP2cSeVD+F89d 5vlbnqUbAB3Tb5oo7/mtEiDiccQND/yj2r3kwRJpZEjtv4vjYXB9oA4uNF1Uh9GS6jrOol 75zX2ww054m8lWIQSHQYB3g2e154FuSeCa4Rp/tsy5cuosLz4LJ4F6uuIcE7QAtrBZE4eS hN+dmyRUyC7Z0ibN19wZPvLUz/e+PN9bpAiooOhLWPyYlAc9admoMOgOxnskKWJTf3RbL5 uKpSdXBdIEEXACUdAkoeVl5xiLQn11cAaaYbBk5NS9/kAtrHv9L8sLavEvqkXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PHYM259Szz12WB; Thu, 16 Feb 2023 11:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31GBuUrT056274; Thu, 16 Feb 2023 11:56:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBuUFI056273; Thu, 16 Feb 2023 11:56:30 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:56:30 GMT Message-Id: <202302161156.31GBuUFI056273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: 9410b6b99446 - stable/13 - linuxkpi: Add + include it from List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9410b6b994469040262200f1465fb30c9cd8b64b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=9410b6b994469040262200f1465fb30c9cd8b64b commit 9410b6b994469040262200f1465fb30c9cd8b64b Author: Jean-Sébastien Pédron AuthorDate: 2023-02-10 10:52:12 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:20 +0000 linuxkpi: Add + include it from The header was moved in Linux 5.15. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38540 (cherry picked from commit d91cf060205cfe479675d7fb4ec95d2ed6a9b76c) --- sys/compat/linuxkpi/common/include/linux/kernel.h | 2 +- sys/compat/linuxkpi/common/include/linux/stdarg.h | 33 +++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/string.h | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 54b558d0bea2..aee299efa732 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -58,7 +58,7 @@ #include #include -#include +#include #define KERN_CONT "" #define KERN_EMERG "<0>" diff --git a/sys/compat/linuxkpi/common/include/linux/stdarg.h b/sys/compat/linuxkpi/common/include/linux/stdarg.h new file mode 100644 index 000000000000..b6141038d69a --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/stdarg.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2021 Vladimir Kondratyev + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_STDARG_H_ +#define _LINUXKPI_STDARG_H_ + +#include + +#endif /* _LINUXKPI_STDARG_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index 932bed81d034..65422cac629c 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -39,6 +39,7 @@ #include #include #include /* for BITS_PER_LONG */ +#include #include