From nobody Wed Nov 02 17:03:10 2022 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 4N2Y9q1zbgz4gP0q; Wed, 2 Nov 2022 17:03:11 +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 4N2Y9q1VWkz3qX8; Wed, 2 Nov 2022 17:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408591; 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=MNrXVKkHj7qZENhUcqG3U/PGWMWvdV08GlZ6kREjOMM=; b=SipHXEZ99Zl7RDPSJFdDUKg3Q6FfhEVlUJcyEiIsL/FMHVUI2ZbPl1Zo3R3Hi+N6GKELOH hE481B0/oF7ZKNqFwrdDecF8oWb50bogbmLeACJ8szmlBYCYfXbba5pO3xFecJjhQDKoTn 8a/D4RK3vQg6cFqJVqsub6PS37Wv4ogN6fG96cUdXVUASdfJbYB8i3GqB0bxxXBOWap5+Y AYmLMX6RFVYVn9pLWstwsfVM6BI4sCkSX1fxSSi6JKEJgvfR82/CMmqURx1jYxUJxRA6Pq 41glWXDaaeQPcdpuPw/lmR9zu3cfAGhSLdwUtcsYUUkPZUnaNcwLaT87qEl6qg== 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 4N2Y9q0bq3z13mx; Wed, 2 Nov 2022 17:03:11 +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 2A2H3Aos065059; Wed, 2 Nov 2022 17:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2H3Aiw065058; Wed, 2 Nov 2022 17:03:10 GMT (envelope-from git) Date: Wed, 2 Nov 2022 17:03:10 GMT Message-Id: <202211021703.2A2H3Aiw065058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 3c631d2f19cd - stable/13 - extres: syscon: pull in sys/malloc.h (fix !FDT) 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c631d2f19cd7a1649393d3d914898ebda41fec3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667408591; 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=MNrXVKkHj7qZENhUcqG3U/PGWMWvdV08GlZ6kREjOMM=; b=cYfH6Czu/sIfpIWKlnO6wZMgnFJZUlvcM6koq6rJBxVGfHvbnwIeCUSWKkOuSGWW3INFR/ 8evz4rF7O98uIZ7N+qtkG5LBK1BmaPEJdj0Y5Knb2oHbrd0QP2rzzdO8x7wzXGZeP/EZ9K QHXXxGl3PXKTancEDgT5u65mea1RBB3UKLUPG1+B47ordlxH0w07iwKdpnTA0BoX7GN3h/ fxRPxqjfBeXQZZczshmGbR52/MkUl1VW1uNp73k/8JRsBdHYvbRKAsYKpK/7C1Lcw2Ybfi tYhMzbIxPSHunCba4POUj/F1qJMzaLACAz0HqjfWLa/85I5KW8N2RMdyEWemPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667408591; a=rsa-sha256; cv=none; b=lGyFY4yPgA6PKlNON0UtFKStwm0ZAYswWAIWIzUgSLLOVI/wMM723n3/joxYs3IxTdl/BE v8w21E7/kjdh7Kx2xQgfCI5OzHQPuZfT3GeJcvJnYo+TJyxooOfKAXlHTutzn1sHXhMjsl otF/GL1ejU3P3oOs7Q718kHMv7Y7z23M4y+2TnGPWM0RPR0cSaelU3UQT9QiDYyWKScsJc 1//eADUM2YFEGbAHY0mvtZWWFcu7C+n/QAcaPUpMYqtoYvQY+fHpmDdE/QvxEUEcagD3TO eY/7FI2hFBC+Tr6c3q2zNcfGHJtA6atQLizEmtuxBigSxuMU+khwaRdIN2nNKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3c631d2f19cd7a1649393d3d914898ebda41fec3 commit 3c631d2f19cd7a1649393d3d914898ebda41fec3 Author: Kyle Evans AuthorDate: 2022-09-29 19:33:32 +0000 Commit: Kyle Evans CommitDate: 2022-11-02 17:02:25 +0000 extres: syscon: pull in sys/malloc.h (fix !FDT) syscon currently includes sys/malloc.h via header pollution from dev/ofw/ofw_bus.h -> dev/ofw/openfirm.h. Fix the build without FDT defined by including sys/malloc.h directly. Reviewed by: andrew, imp, manu (cherry picked from commit 79794d5c18b7df9458b3c609a189bf2159e234e4) --- sys/dev/extres/syscon/syscon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/extres/syscon/syscon.c b/sys/dev/extres/syscon/syscon.c index 9bae30432880..3701c6e8fe70 100644 --- a/sys/dev/extres/syscon/syscon.c +++ b/sys/dev/extres/syscon/syscon.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include