From nobody Fri Nov 18 05:06:50 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 4ND4Wt3hnKz4hM1W; Fri, 18 Nov 2022 05:06:50 +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 4ND4Wt3FXlz4Gsc; Fri, 18 Nov 2022 05:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668748010; 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=vbaiZ0EnY75ieHw1k/rqsUPSxLIwpaQaE+YpyApLqSg=; b=Y2jsxy0hZenZorbv8rgtbbd53f47+zWnXHYXMxbiJy0iE5K49hNpKIXvL0ybNNBm1VafAE xjrPcgRjKdWdvtjQJoPLCvT+dWgtjn3X69XWqxzYupEepQjo/8EeUxWfz1ZVi8qHg+R6WT SrNN6x8wJWgRWT+SCawVfWM+Owibyh6lgp7yA/iH8pux6gBSBLu8m/6PLGmIgUJSWUd/Qf CBT37gJaXkubUbgw/VjaycLU94v8R3K9HXUeji2bq6Y+MKp1rNeSak+txSPI2pIxsyCM/J cahHFU20VumdliadcTBe3WIeuW0e25a329h5N3CZThFXja1dDrunEleJotKl9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668748010; 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=vbaiZ0EnY75ieHw1k/rqsUPSxLIwpaQaE+YpyApLqSg=; b=FKkWPa0J4WRfkZ3PCUfBF4CVKq3sx5AGkHczpQdMLKiJeyCBAde7UrrBdsD0a9tX1Fh4w6 537xVpWF5J078T7nqyGDHqXfXz1w1EutqodI3aGmYW8z17Xv7T6AVIKo+7rPDbqSgr1TBo moGBzeSnvqxc3ex7xBjzlI0EJLLbuslnIYoy70gQokd8OF5r1LWcmaGFxAfrtSkj25nbeb Solk8lLPtJ0ShOGLlbNwwVdN/LfSqFIppzhdrexOKeEOfbzmaRcr7s+cvOuPGv3UtsQPGj oa5A1xzWulFzkOC66LtOlGPq8BCU5M7KhvShoPlHlwaihO/btwaot5UISzfxjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668748010; a=rsa-sha256; cv=none; b=u8JPeV16vfHVRtqdj6NJfpLFMoIXd3zEyOwhrw3VxVpON+ok6ee585yPynIurkB6ka8e4v OtMx2T2K/xyOYaMbBScpQ6wzRT8VgpeetiaODWbYa0pFiKrkL09SEBbM+LaICWXHSNsAgi 3qlYtaXC4yfX6DCyZsYehoWdslGzz0dT/Fe2wakg38eZKcozgFzkegZdGK9xtY+Ot8dTxR p8tjxGlKZrss/yrftruaLSEg8eoz/YsWB9wvdtguJ5z21Ooyd6z/MM57zNNRdN7B324p2C 5MhcfujAyjNK1ok2x8v8hiyxQ7YNIN6Cd2m0AmzQDky6Zk13G0Y6e5OEeOz/BQ== 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 4ND4Wt2CqHz18XK; Fri, 18 Nov 2022 05:06:50 +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 2AI56o0g092791; Fri, 18 Nov 2022 05:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AI56ooZ092790; Fri, 18 Nov 2022 05:06:50 GMT (envelope-from git) Date: Fri, 18 Nov 2022 05:06:50 GMT Message-Id: <202211180506.2AI56ooZ092790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: c2a74ca2c3d9 - stable/13 - Fix to b999366aab4e for compilation on i386. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2a74ca2c3d9ad3465f7cb88ea60907a097fbdbc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c2a74ca2c3d9ad3465f7cb88ea60907a097fbdbc commit c2a74ca2c3d9ad3465f7cb88ea60907a097fbdbc Author: Kirk McKusick AuthorDate: 2022-11-18 05:03:01 +0000 Commit: Kirk McKusick CommitDate: 2022-11-18 05:06:16 +0000 Fix to b999366aab4e for compilation on i386. Reported by: jenkins, Philip Paeps --- sys/ufs/ffs/ffs_subr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 01981c782499..42f1e1a1cad3 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -327,7 +327,6 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk, #define MPRINT(...) do { } while (0) #else #define MPRINT(...) if (prtmsg) printf(__VA_ARGS__) -#endif /* * Print error messages when bad superblock values are found. */ @@ -336,7 +335,8 @@ static int prtmsg = 1; SYSCTL_DECL(_vfs_ffs); SYSCTL_INT(_vfs_ffs, OID_AUTO, prtsberrmsg, CTLFLAG_RWTUN, &prtmsg, 0, "Print error messages when bad superblock values are found"); -#endif +#endif /* _KERNEL */ +#endif /* STANDALONE_SMALL */ #undef CHK #define CHK(lhs, op, rhs, fmt) \ if (lhs op rhs) { \