From nobody Mon Jul 04 11:33:59 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 E71948BE4EC; Mon, 4 Jul 2022 11:33:59 +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 4Lc3bq6BWVz4yfJ; Mon, 4 Jul 2022 11:33:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656934439; 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=IS/Q/VSkZBMCFjp8k3IiaQECMHuPjbL5s9fl/Se6zxM=; b=ZfAw2Xy0O8xaR6t+we2n9LosZ7XcsRqkSTXEdM6/81m7/AhLcn/YVO4w3w9F83uNfJrAUx /Z2arJduCNM1mCP40YOrt6sj+VD2f0i7ErAzTNeLGcK6bMg4kULEBwdTBQpJQUSQKnYNpX 6NJTU+IdoFuuP4HbG3CJQRqvd0ASDpTx2SDF7lr7WTGUtcJRifqedNLSgisvEkubVWJjvu POUNJch5Y7Tpg2D8WSz8U4UrAlT38VoOhMiJebttwVIKCix0W4yAa1AkFfI8JwRf+zPuI6 UOW7y6R1HmY9LKnEnRcq+wMm7sh5E+cZ5sn++ZEfmw85qTB4c8RSlY1Xf0zWYw== 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 B4365106A0; Mon, 4 Jul 2022 11:33:59 +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 264BXx0a033849; Mon, 4 Jul 2022 11:33:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264BXxUp033848; Mon, 4 Jul 2022 11:33:59 GMT (envelope-from git) Date: Mon, 4 Jul 2022 11:33:59 GMT Message-Id: <202207041133.264BXxUp033848@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: 619fe6570947 - stable/12 - liberate wdog_kern_pat call from SW_WATCHDOG in arm minimdump 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 619fe6570947f8e66467c2b6399aae09707be65a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656934439; 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=IS/Q/VSkZBMCFjp8k3IiaQECMHuPjbL5s9fl/Se6zxM=; b=v23bl/YlJJ7GGQzb+i0aQN41bZecH6jnORwHThmFqnZkSGR2BbPyxo5Cqznl8gywlC8m+Q EnCto1WGaOi5G+sjsJvMz9FdVPjjUpwN3FEPhR6RGPaADQOCG8kx9e45NZmuxiAJqGCSJ5 85aHUYipeClepAY9GZDRdhqfe/Sg4MOKISLtfZce5cCbTU20YElkNuV4kDuoO813LxgZR5 DS22ycoVcMTkHqp+NUAz5UUdTr8pirX32SJp+rnByLmmNoHK2Y+tk+A4RFrH86mxJojc3D BsVCcqIKS55SakNWBKhYxBQLsQ7bPD4tmeXmNnKifGPdC173Z0/DB0Q2fBRiVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656934439; a=rsa-sha256; cv=none; b=obac59Rd6x6lYxtfMvnMB0TsPMtY0aA0QxflDPoK5SKHkmnYQDAfcpkelkcYsbJzTMncVd ZHeBboLigGJsmUaky+r+53Ztq2sxJQRoa7k6r3I/XZ+MRLTVq5/SIRPaQyGh54kCqjsbG+ 761iyltYvt3JvneVeTSpDv8ZoDB5i9D3HPCFJiQj/83oN1Sf9Vh/8hR8BzQ/ZH4+84PZW8 61pQ10fabAJJba4GXZtUN3528nkTVEk6D0NxWl80kiMTtWxnVcxW7H27apOe3gzveZpj+P OX1QlpeO/J+865Neyq5UDKhxkf+js75Wvl7nNQbwp8UCViaL8VJujwHtTew9Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=619fe6570947f8e66467c2b6399aae09707be65a commit 619fe6570947f8e66467c2b6399aae09707be65a Author: Andriy Gapon AuthorDate: 2022-02-16 07:53:42 +0000 Commit: Andriy Gapon CommitDate: 2022-07-04 11:33:23 +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 f9e3e838104a..1bb322023c71 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 @@ -136,9 +134,8 @@ blk_write(struct dumperinfo *di, char *ptr, vm_paddr_t pa, size_t sz) counter &= (1<<22) - 1; } -#ifdef SW_WATCHDOG wdog_kern_pat(WD_LASTVAL); -#endif + if (ptr) { error = dump_append(di, ptr, 0, len); if (error)