From nobody Tue Apr 5 04:32:14 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 42B3E1A9014D; Tue, 5 Apr 2022 04:32:15 +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 4KXZVk5lm8z4fqy; Tue, 5 Apr 2022 04:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649133134; 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=3CMDDV/fW8VHlFErsyQgNms7XRU334rCmE6N+fa3hJc=; b=LO9FcJt/kD80C5Ci87aT9lVWm9YjkeDEMaOpRAy+It/w5BdxiaQV14kCNNZnLp0jN/TZRS nV9VQKmdORJX9Pq61Jp6SDq1wGN8iXz01fPJMTP4huHRyFq5D6ec0mYsaRFPz82/IemVyM VewqUqp5DrFpQX+MHCeULxnBF/x7EScT9DrqjpFhF5ntlfGW9ZxfEyfRhJ4yQSt7EjgIja wEJdH4VRVjI5Qk9mDB6f3V2IHo4FOf4e7J7k7wOc04c7eeawaHfEmzKDMZq60wr8NgMWwo sDq1SjNkvLNuN3oTsfh+ULXQP/0I1MDIlPsWUv2vsd7FZPRRR9c2Xu84EpiGUA== 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 357871FADE; Tue, 5 Apr 2022 04:32:14 +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 2354WELa008731; Tue, 5 Apr 2022 04:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2354WEmB008730; Tue, 5 Apr 2022 04:32:14 GMT (envelope-from git) Date: Tue, 5 Apr 2022 04:32:14 GMT Message-Id: <202204050432.2354WEmB008730@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: 05d3c5fd182e - main - fd_probe: only define unit on x86, other platforms don't use this code 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: 05d3c5fd182eeb33075ee14e2802c94882dc2c41 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649133134; 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=3CMDDV/fW8VHlFErsyQgNms7XRU334rCmE6N+fa3hJc=; b=kYjHnzPVYfgyQQEHCKEqgByfChgD6GX8PcNm9GUq/CvIuyEJwRA+XPG5wvrTRTW8kc21n8 9gv46lyb7zpNNp3mYcrVYrwddr069fRlbZeOP31xkSTfaiRsTM3Vn3xY3J+7LhiraKseH2 LYwMs8Cgz5K49l2/zGmaEY6Dh1yRa3HhVaHbVV3ooTDHu95Wv5CzgAJxZLGLcxIsn5M2RT E5uel9vTgtYNAaelGbZCl9WmfbkiOULog0bAFYbk2c8yw7RRZ2HnFBuDEN3MlcDpj/6BP6 H+q1gixLQrEGcSaaDuih2SgFSBj2gY3ye4c8Rnnnv2vWT/n2/0cUNSAOnrCDgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649133134; a=rsa-sha256; cv=none; b=NM8F0Xlyti1ub7E54BDvZbiIMi4UwLFQRMRHM2VRLtvjfr2hvMxuMmle3nEVl4Cm/vrgky I1sMLT3AUN97NIMpT7okxCAtOH6MhEu026zhH75VEb5HW/wPZ0L16GTLetMdwS0cIxvol2 /Cud+SB+zHeSpvOS3Dv9MaVhkxILXbNs8eMvP2eD0m/BFqZlxx4mX89FjddCEg+5g955FY OUeI7hXp/8WJcXaS7OrLBO0kfHUDJZq/ra6ie0pqKuhNU2LzYlHamSP5WrDQsUoLGij0rg ZuVJnMiA1LkpK4lxhE+hQ4f48NNN1xP8NIGmTmSj1zfPYVST9PRBe72UQCaxLw== 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=05d3c5fd182eeb33075ee14e2802c94882dc2c41 commit 05d3c5fd182eeb33075ee14e2802c94882dc2c41 Author: Warner Losh AuthorDate: 2022-04-05 00:03:54 +0000 Commit: Warner Losh CommitDate: 2022-04-05 04:29:28 +0000 fd_probe: only define unit on x86, other platforms don't use this code Sponsored by: Netflix --- sys/dev/fdc/fdc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index b427e919add1..5c78d02a5502 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -1887,7 +1887,9 @@ fdc_print_child(device_t me, device_t child) static int fd_probe(device_t dev) { +#if defined(__i386__) || defined(__amd64__) int unit; +#endif int i; u_int st0, st3; struct fd_data *fd; @@ -1903,7 +1905,6 @@ fd_probe(device_t dev) fd->dev = dev; fd->fdc = fdc; fd->fdsu = fdsu; - unit = device_get_unit(dev); /* Auto-probe if fdinfo is present, but always allow override. */ type = flags & FD_TYPEMASK; @@ -1917,6 +1918,7 @@ fd_probe(device_t dev) } #if defined(__i386__) || defined(__amd64__) + unit = device_get_unit(dev); if (fd->type == FDT_NONE && (unit == 0 || unit == 1)) { /* Look up what the BIOS thinks we have. */ if (unit == 0)