From nobody Tue Jan 04 23:02:01 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 87020192DBBD; Tue, 4 Jan 2022 23:02:03 +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 4JT7RG33xTz3DJk; Tue, 4 Jan 2022 23:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 08D62215CA; Tue, 4 Jan 2022 23:02:02 +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 204N21fd027872; Tue, 4 Jan 2022 23:02:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 204N21DE027871; Tue, 4 Jan 2022 23:02:01 GMT (envelope-from git) Date: Tue, 4 Jan 2022 23:02:01 GMT Message-Id: <202201042302.204N21DE027871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b4dda138e8f7 - main - neta: clk code ifdef'd aarch64 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4dda138e8f7352780a75ba77b65e8b0bb230203 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641337323; 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=TZm5YMMRXPv7S+DrJhlleczCF3rVIf2M4+5m7xU30Tk=; b=dImthC5QpenSmN8QhqJCTTJzuPk1IawoyrUPxpn1aqSoMDIgl50JFgf4K8dzOOyozoUxxL 7WJYW7QzFfmrqP4/683uTF18JfRb1YY9NKf1mf6J2Krae+Hek9O82XN+sDKvVNwYE62q1C BYF3S9EQtKVMpuJBO2zV4wYr2cw3j/SBXDxKQUb+9aFeGo/CQWVvDmo5B6k6yZl7j77YZ8 cO/FcGVCjOm604FavVALp6niZJXcbWv4LWUlD/QVoa+aIcN4WcW9Zgf4U/fRLLBoq8HHik NDxX88WLbOPrAM4DoRroRz4ZVjVKNKlA0d7AhEvW1jVYPcRwh3Yn3LOnplBStQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641337323; a=rsa-sha256; cv=none; b=SrcDt2O9iQI0qAIoKiGhC3GJjG8BHi9EwVPgKhWwizMBr5j4eVbKQPTf752Od0dthpNH/L IQ2I2fpol4iRKOLETdVqYXsYK9B4Ob2ee1EX5mK5d71NwM3Eaca0n3/AbpgHc1n3GOKn4K cInhGyHbj28/i8GrDu6dL6+svmxrZpu8vj0x/Q3fcwwEi47tELRgjsag26ZBIve1QxPogm o2GzkRf1M/8oIOt40yMaamqTvdPI62KC+NQv+hOFOuLJNYmJKWdYSWU1Eedvh8TK3gDdLB LREBA4vbVRDtiMOWliThcSebSyJk/dGSuvYaPxFXENai4ikb3xigPSLia7Trmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b4dda138e8f7352780a75ba77b65e8b0bb230203 commit b4dda138e8f7352780a75ba77b65e8b0bb230203 Author: Warner Losh AuthorDate: 2022-01-04 22:59:00 +0000 Commit: Warner Losh CommitDate: 2022-01-04 23:01:14 +0000 neta: clk code ifdef'd aarch64 So #ifdef the clk.h include aarch64. Otherwise the right kernel options aren't always present. Sponsored by: Netflix --- sys/dev/neta/if_mvneta.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/neta/if_mvneta.c b/sys/dev/neta/if_mvneta.c index 0ea86330877b..f4a5c9b52c0d 100644 --- a/sys/dev/neta/if_mvneta.c +++ b/sys/dev/neta/if_mvneta.c @@ -65,7 +65,9 @@ __FBSDID("$FreeBSD$"); #include #include +#if defined(__aarch64__) #include +#endif #include #include