From nobody Fri Nov 10 02:22:21 2023 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 4SRMzK4sftz50YTC; Fri, 10 Nov 2023 02:22:21 +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 4SRMzK4JyYz3QG5; Fri, 10 Nov 2023 02:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699582941; 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=ofKtBhLEQCCo7AOAe8Jo7E4cAGjljoBb+rHibpRULq0=; b=xyTLmwRN5JRJgDPHVwsy3eRN23GeMl3liTwvhEXL3d+fHNsSAV1xAvIi0rbLQcZstWcEPC HeYSd2OSj+Fbp/7qPl3Kfy/HdP0HXT/1nGdm4z73ONYJFYrB2jioQg0AgF0RNfBHGf3yMQ pu352PcyLhvg/L+ovr4opXdvdRdH5YNFVti9lZ1QCnxIqUPEk0QYU6Zf7FAE5nfQjoRw81 vauDIhazoD0yMp9poADAIbgjhjgYtNLHw+dbq5Tcxk3BxVXhae9YYXeVWtaGvcaofsf6Cq hx3b9E/bS8jHY5ZWlN9jy9TJdiEozvPYgt2Uh0qmu4z7xzXZJPfYB6gL+l9X+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699582941; 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=ofKtBhLEQCCo7AOAe8Jo7E4cAGjljoBb+rHibpRULq0=; b=IoFV/7x7rSqkICKZERqYLH0vOTnaEtNCMFx0Tg/zxk+nQQO5OKYhh7HLiwAh3lPafU0LHy 2qwH+NRZRaZHrNi0rF1ZH3bSTrVMQg6wjmMIdkoMXZ5cukKIxMvBgNT3vVoYLQ8DTb0QM0 rcAsGE4IOFqfZUtsfk6HKOCRvXi5vImxp+t/nTE/p5bmh4d68SA/mS0fi+kqul18iLkoql Pn/9ls2LKDtE67eYAal/J7P9xYJiEqqghVuQFu4FMEZJ4ZzYoQeBq0kUVeI48IqA+b4i/y 8yjH6Qb3iJ+D3SneL0sDoD25I30G/n+M8dn0j10kf3R0+i3iO59B2fzUa1c3lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699582941; a=rsa-sha256; cv=none; b=T+3Aa/PywuHlKAPhMOyI5kx1bgHNsBePztec8UA1OVPrXIjH210E1y1v8/LEXXUffwNRmk crr2LvRPrdQ3JSBFcgkY8pwEnNdjVUiDPT3+y2EYEgIOmNyMXwWK6zhy+BBhhlcEm4Czjy aY6xmyt399LqvmyCaqqCv7heGVWwJRzh6yLfwaatAxNwwU8ahkPd6H0PsOS7Y0i3a63tns 8OIMf42DVSy7TmX0oMKztOIL6drL0mxSdmb/U9y7Ogfs2jupzNLnN03LqbLs0pBtBC9sGH d2TlmfjdOtVbnM5J5Vxiskv5CQXNIxBZ47CR+LuNS0lN1eOH8PscOrnxCMKyLA== 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 4SRMzK3MX3zgTf; Fri, 10 Nov 2023 02:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AA2MLO8048879; Fri, 10 Nov 2023 02:22:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA2MLLN048876; Fri, 10 Nov 2023 02:22:21 GMT (envelope-from git) Date: Fri, 10 Nov 2023 02:22:21 GMT Message-Id: <202311100222.3AA2MLLN048876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: f0fa40867d1d - main - Fix build on powerpc after previous commit. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0fa40867d1d556ee0400ca6e1483b9ae1a068e2 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f0fa40867d1d556ee0400ca6e1483b9ae1a068e2 commit f0fa40867d1d556ee0400ca6e1483b9ae1a068e2 Author: Alexander Motin AuthorDate: 2023-11-10 02:21:47 +0000 Commit: Alexander Motin CommitDate: 2023-11-10 02:21:47 +0000 Fix build on powerpc after previous commit. --- sys/vm/uma_dbg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/vm/uma_dbg.c b/sys/vm/uma_dbg.c index c256e62875c0..2f6360699419 100644 --- a/sys/vm/uma_dbg.c +++ b/sys/vm/uma_dbg.c @@ -165,7 +165,11 @@ dopanic: off = (uintptr_t)p - (uintptr_t)mem; ksp = (struct malloc_type **)mem; ksp += size / sizeof(struct malloc_type *); - if (*ksp != NULL && INKERNEL((uintptr_t)*ksp)) { + if (*ksp != NULL +#ifdef INKERNEL + && INKERNEL((uintptr_t)*ksp) +#endif + ) { /* * If *ksp is corrupted we may be unable to panic clean, * so print what we have reliably while we still can.