From nobody Mon Jul 04 10:17:40 2022 X-Original-To: dev-commits-src-branches@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 03F778B3F9C; Mon, 4 Jul 2022 10:17:41 +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 4Lc1vm6dxwz4nnV; Mon, 4 Jul 2022 10:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656929860; 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=M1Yr1hcP24JwcdJKP10gcKhvZUtAv2dhSDIgjGTozQk=; b=CYD5+LFrQ5mzX5TEQIcIr4rZ+ARFvjLcvU8ML3sV0GkhuiNmg5DzKYxX1emJIx1xYyGtan fSyCkZPJZsiSPYaLMjd7eMg7UbZ2kGQSDr2Y7A+w1+6669xmqsHzd43suS+WwHO056sGaj Q6bfT4nDh3L3ntt3mUu1r8ZEoN9cx4AkufrOVjTM7eh532nJEV814mZOOEwz81yC8T4joP 629veD+pZ6um9VjkYfQgtL+Gn2yyZ3CYdHHr0d99nIfLtZE2Que8+GTX7ZE1wHX59qZinL KKkSJfOTh+5DVPEY863YN4ostNu7mEiapCxb6JH/nSzPahm1WTvMmDM3QD20Mg== 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 C461B70C8; Mon, 4 Jul 2022 10:17:40 +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 264AHeon025632; Mon, 4 Jul 2022 10:17:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264AHek9025631; Mon, 4 Jul 2022 10:17:40 GMT (envelope-from git) Date: Mon, 4 Jul 2022 10:17:40 GMT Message-Id: <202207041017.264AHek9025631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 153664d5adc0 - stable/13 - liberate wdog_kern_pat call from SW_WATCHDOG in arm minimdump code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 153664d5adc04e3b2a1609cf6f27c9d28246dab0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656929860; 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=M1Yr1hcP24JwcdJKP10gcKhvZUtAv2dhSDIgjGTozQk=; b=qN5fGWAphria4mAC3A+ddng74cCQdZ+rzEN0bdo+jPFmjqd8bTeA8b8YNmDxNkebcY6yxl VldMoG0UoAXkR3FIH36qqLAs4t7SuVV7gjOTWVhNybKCujuXi4G/ye/+YQ4Tl/Qi5UvKfI 2sBtpUbO9pSbDboG15gkUUwFvVoCPydiGSrWpShuG0qOTiXuCn685PDydxXostRjDoRr6j B8g7VDGlg8rDLDWb8WMOI1oGWySEfvlBM37Jkhf2bKjpROS3rZmMKP9dLvWTuUMv1mE9Mv tVJKz9ZfLYtahVoPViQX/q0wq6mxqrubKvoS8XPR4dbeEMFPWsjLTzjaw7IS+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656929860; a=rsa-sha256; cv=none; b=lCe6aAWjtrRAfQqLmZmqFJxvVCBgRCnO/wWj12j2v5ShQswAranNOt/N7v31ucerri8izv RFUBx4UJiXW8k0ixVPMlUoCve7V4VLUBMXZeZCCUvWEwP6b1GeiDaaKprDxY0osd9Qu5EH 7oBzFV7wYT+HuDK7/jk9NkD1B7H1DNOj2ufDyYwdRPxQbSog5Ewd2OGhDteQ0TdjxdYUZt bJawqsM41oabWkZuUpF4COkgRos8AwAykB+MMu4AU8BzMglGsHTgceYodL5HPuog5YzYhY jwoq9zq8QGyCJ51gX8YnIAl/KPpgchxGHocad7XXse0w63oP/heVXgSGNIMGvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=153664d5adc04e3b2a1609cf6f27c9d28246dab0 commit 153664d5adc04e3b2a1609cf6f27c9d28246dab0 Author: Andriy Gapon AuthorDate: 2022-02-16 07:53:42 +0000 Commit: Andriy Gapon CommitDate: 2022-07-04 10:17:24 +0000 liberate wdog_kern_pat call from SW_WATCHDOG in arm minimdump code Obviosuly, there are hardware watchdogs on arm. (cherry picked from commit 1a93b2288cb1cf160214272d62dcda2ad76a1f95) --- sys/arm/arm/minidump_machdep.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/arm/arm/minidump_machdep.c b/sys/arm/arm/minidump_machdep.c index 9db111547aaa..8a74dc9818ba 100644 --- a/sys/arm/arm/minidump_machdep.c +++ b/sys/arm/arm/minidump_machdep.c @@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#ifdef SW_WATCHDOG #include -#endif #include #include #include @@ -114,9 +112,8 @@ blk_write(struct dumperinfo *di, char *ptr, vm_paddr_t pa, size_t sz) len = sz; dumpsys_pb_progress(len); -#ifdef SW_WATCHDOG wdog_kern_pat(WD_LASTVAL); -#endif + if (ptr) { error = dump_append(di, ptr, len); if (error)