From nobody Tue Oct 18 05:40:21 2022 X-Original-To: dev-commits-src-main@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 4Ms2kt1hmMz4g5lc; Tue, 18 Oct 2022 05:40: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 4Ms2kt1Bkbz3Y0X; Tue, 18 Oct 2022 05:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666071622; 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=gexej00kv95RU6hKN+bkpFmVL7Qgnna8bWWv+VWany4=; b=MITsypvmx9C3h2kFYyKJWmSQDztax7dE+fJirqRx3+d/sCDWc9zfSI0RnrhFfNTGinwIrs lDfCykGrUtma+eRNZxie4fBCI4leSnrX/bOsKtqbZ0ofNGMeL8ExkQ0vQEfREgQoeyNlm2 wLm7T+M/if2JZ6TovS10nudVRiLTPxTjFqvPsLbQmnnDzKZZB/GKiP3FuEGAoj4J6QNlgf 7o8lGxPDRuO7mY+iCLCVe1EbdwijnlIAg+XQfGkg1XqfwTx0h49RoUBU1zgo9NOmM2wD1S L3nCFQevHouR/HnX9pbNyz3yxzcav+VBALnh8iQCQCv1P01Tqezcrc+DZimCSg== 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 4Ms2kt06nTz14j0; Tue, 18 Oct 2022 05:40: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 29I5eLLb067824; Tue, 18 Oct 2022 05:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29I5eLc3067818; Tue, 18 Oct 2022 05:40:21 GMT (envelope-from git) Date: Tue, 18 Oct 2022 05:40:21 GMT Message-Id: <202210180540.29I5eLc3067818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 7fb975c8fb97 - main - dpaa2: fix build without FDT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fb975c8fb970b35fc34561ed30a0fe220346cb6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666071622; 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=gexej00kv95RU6hKN+bkpFmVL7Qgnna8bWWv+VWany4=; b=Xtvn4hVwiTlLUhhN3pW5ZjwRykglvCvL4VBCkAlALpQHjn/KCbleKOQ44KaODdLCuJxpTH gGFiYLNdzgdkWKgUgioC2eFLxhvNEJXZqXE5JkH3TTcjB2/GUSn37oTgfzA74xI0HC49C+ Tu0tF2VGzOyRl1w6aE0+Qj7kb0keOtxLS0W2jB17LOYrrCSZieR78H/8RtQgjAQO92cU7y iRETy5Q/5CEM5SDK14gDK6cbwf+NupQ0g5z+mfuYAbxJQlSwH6fEBxo6P5gqFe1i/c1pVF uA67/VQ4nuqp8+cRb7eU57A5LOCMbyFNQGZddkAZ2uKYav4QLtz5u75aI6DRBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666071622; a=rsa-sha256; cv=none; b=yimhUpu0xrLGtv+pE7EWh6XmTxpk9vE4NLZpogEp1h8430sglhJ5MN+/ZhJxsj2CHvLZh6 0tF98eWiNPFvEUMNMX1GE2N4wVgRB/Q2pBL6NlOSxhlLtXNfSckrIkc+6fDybhpWGEtLWT RU+bXEi23JOCva+woDGpNIYX7JXOFQcq0GE7Z9ORXKxEL/RE/tHlxrz69ibNuVgauUYlL7 hQjHPZTkr9fxN2/mjximJmNMUxEx3lBWaZ9bvNEPh8PQj6Vdsb3InyWYNAovrntcgBWm+l 4FPsW2gs5egTgKfR/YJFEx6Mkdz0FPetbLALliY5V3x8uYpWqIqYmHJ9kO1/rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=7fb975c8fb970b35fc34561ed30a0fe220346cb6 commit 7fb975c8fb970b35fc34561ed30a0fe220346cb6 Author: Gleb Smirnoff AuthorDate: 2022-10-18 05:38:02 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-18 05:38:02 +0000 dpaa2: fix build without FDT --- sys/dev/dpaa2/dpaa2_mc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/dpaa2/dpaa2_mc.c b/sys/dev/dpaa2/dpaa2_mc.c index 36e3166f1f84..83563b82c6c7 100644 --- a/sys/dev/dpaa2/dpaa2_mc.c +++ b/sys/dev/dpaa2/dpaa2_mc.c @@ -742,11 +742,13 @@ dpaa2_mc_get_xref(device_t mcdev, device_t child) { struct dpaa2_mc_softc *sc = device_get_softc(mcdev); struct dpaa2_devinfo *dinfo = device_get_ivars(child); - phandle_t msi_parent; #ifdef DEV_ACPI u_int xref, devid; #endif +#ifdef FDT + phandle_t msi_parent; int error; +#endif if (sc && dinfo) { #ifdef DEV_ACPI