From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 573A9C761AF for ; Wed, 22 Mar 2023 19:59:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231302AbjCVT7d (ORCPT ); Wed, 22 Mar 2023 15:59:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231248AbjCVT7F (ORCPT ); Wed, 22 Mar 2023 15:59:05 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3A926B33B; Wed, 22 Mar 2023 12:57:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5D7D8B81DC6; Wed, 22 Mar 2023 19:57:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D619C433EF; Wed, 22 Mar 2023 19:57:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679515072; bh=vuW0vUuDsrbF6EdZBmyISlMkpcKD10t+InuXT0eDUMk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E3wtMk/CRRAT64OvyGj1U8zDo7Ai/2z/EBDJ9k8G1NI8Z8p0DNyuVN8XY6DEvqart ewa5KQt0uVar8dQXCyRe0zBOudDA8r+q3+hxw8tVHan/8B6mtFYLzMwVilWzSWGtg5 u4Y001ZkUhI3GMOiFEZwfH8wHMAE5adj3G6B/sBzgeEcMZ8MHpE4BmWwW4ExpzJUDS 7K6OCPr0tmpQFRHrxy5+zPFyaaJSsrbR0rhCxdlk5p4qsGQ8hlG4tGCGTNifQ45lT8 6kuf32PjPTuTrnV0zydU8zF8IIMuKdHhYzoL9+uOnkUPHOnKB20jcoQD26I19cqfLM ARbbSdBskg3MA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= , Nick Terrell , Sasha Levin Subject: [PATCH AUTOSEL 6.2 09/45] zstd: Fix definition of assert() Date: Wed, 22 Mar 2023 15:56:03 -0400 Message-Id: <20230322195639.1995821-9-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322195639.1995821-1-sashal@kernel.org> References: <20230322195639.1995821-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonathan Neuschäfer [ Upstream commit 6906598f1ce93761716d780b6e3f171e13f0f4ce ] assert(x) should emit a warning if x is false. WARN_ON(x) emits a warning if x is true. Thus, assert(x) should be defined as WARN_ON(!x) rather than WARN_ON(x). Signed-off-by: Jonathan Neuschäfer Signed-off-by: Nick Terrell Signed-off-by: Sasha Levin --- lib/zstd/common/zstd_deps.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/zstd/common/zstd_deps.h b/lib/zstd/common/zstd_deps.h index 7a5bf44839c9c..f06df065dec01 100644 --- a/lib/zstd/common/zstd_deps.h +++ b/lib/zstd/common/zstd_deps.h @@ -84,7 +84,7 @@ static uint64_t ZSTD_div64(uint64_t dividend, uint32_t divisor) { #include -#define assert(x) WARN_ON((x)) +#define assert(x) WARN_ON(!(x)) #endif /* ZSTD_DEPS_ASSERT */ #endif /* ZSTD_DEPS_NEED_ASSERT */ -- 2.39.2