From nobody Thu Oct 27 16:24:22 2022 X-Original-To: dev-commits-src-all@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 4Myrbp2PhMz4gRBF; Thu, 27 Oct 2022 16:24:22 +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 4Myrbp1lwrz3n46; Thu, 27 Oct 2022 16:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666887862; 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=qLvmKJVtPactB1qeXdGrWoMoCCuHUtucW2d3yfE4iXc=; b=QIic+GuPnUC8VkSluQ8aSu8f01fCRbB3hZfWkTylyAp0E2pH2Lh+IjV8WJ/4lPjR/9/65S ld7bifY69sdd7kCurL7Q/WDdfIiR6TKZzq0lT1vAJBP235Z5rwqOUiTnfzjfVnvd1YLqls ea+eU8SZ/sXZgBDipqHho+11RXuMUvl5xxj7xt4anQDkcaG4xg4WqysDU/8Z+d0YXq4YQ8 pG1IKe/oKbqhiKFgbqhzmZiR6eDjANVNxIdNjOrnnpjDqIEAnvlRTuj3INcTJWDZ+/4iic tmDBgXrE5/sPksdZnLUc9lX5iXzy4XTXm+lnDTz8h6ifoeyNC9DEINWbNYruFw== 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 4Myrbp0pZPz14Cv; Thu, 27 Oct 2022 16:24:22 +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 29RGOMTU090876; Thu, 27 Oct 2022 16:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29RGOMFK090875; Thu, 27 Oct 2022 16:24:22 GMT (envelope-from git) Date: Thu, 27 Oct 2022 16:24:22 GMT Message-Id: <202210271624.29RGOMFK090875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 91e2614a7105 - main - Fix xdma_if.m in an ACPI only kernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91e2614a710520d023fd59108caa971d6e57e0d1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666887862; 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=qLvmKJVtPactB1qeXdGrWoMoCCuHUtucW2d3yfE4iXc=; b=paFXkECZTTSqFirEPM3od8PJA96xeGEHtWjAy2vDsASbqheveVsIm8v6ilvSZFxEiMsv08 xAFvKqjdaSi+Dg7shDBaHKO2Iwh5ilMNIKfV249g9RXOdW1/lWkpicdeuUOzw88mLbdzl4 jNQSbROc9Ftbha5U/cakJBtPHlkXLydN9TvludJlnMKeJJZLGz/j3UOhF0E16nWVxcQ6dW ePQZbbLpQKrtbEEjgdgtj6kktIZiWpEayQIRqTKurZhEmsObY9O60414pE10j4mseCbBdq TNjyQNF1Svqm8vpAB8U2n5AY/34CgE2SyQ7+ItNKG8gh3QfoZlY3j1UsKrxOeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666887862; a=rsa-sha256; cv=none; b=b3VHdcGdGHRPWkK5MrXBUZPD0oLE/VAtS3vrFWneLstwQNG8OS8OQ7iRzAByKcXpmG++xe 2G39+I+vsUmJRjZYfx5bkfMwGwb2PhxiUQuYLI8khqz41fObpyUcOSB2KW0tffRU+TgEgK yiC5TJQkgJtHOsgPBCvJKluhYz2U4QYP7vnj0WGuzyAg9vKHSctAS+SNDMDtn+p/pGSm1I gor5BL8P3SzexTFKkrmJWz/dyAHx+9kC4ZKv3eVawt60ZVmrezZhRCc5ny0j5/8oNK0Xhb XDUILIV3MOmrHrRd9MmmMazbR+DAWq6BVDwjkdC+DPhS3T7WmlwZZcxkdA/4yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=91e2614a710520d023fd59108caa971d6e57e0d1 commit 91e2614a710520d023fd59108caa971d6e57e0d1 Author: Andrew Turner AuthorDate: 2022-10-27 16:17:20 +0000 Commit: Andrew Turner CommitDate: 2022-10-27 16:17:20 +0000 Fix xdma_if.m in an ACPI only kernel - We depend on header polution to include sys/malloc.h. Include it directly. - Only define FDT-specific fuctions when building a FDT kernel. Sponsored by: Innovate UK --- sys/dev/xdma/xdma_if.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/xdma/xdma_if.m b/sys/dev/xdma/xdma_if.m index 61c711d6e24a..b34b72bc5d42 100644 --- a/sys/dev/xdma/xdma_if.m +++ b/sys/dev/xdma/xdma_if.m @@ -32,6 +32,8 @@ #include "opt_platform.h" +#include + #include #ifdef FDT @@ -81,6 +83,7 @@ METHOD int channel_submit_sg { uint32_t sg_n; }; +#ifdef FDT # # Notify driver we have machine-dependend data. # @@ -90,6 +93,7 @@ METHOD int ofw_md_data { int ncells; void **data; }; +#endif # # Allocate both virtual and harware channels.