Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp920196pxp; Wed, 16 Mar 2022 21:20:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFQXzZsHzbS3ZokdJRLwbrdghUJZ3zoAuu/qDTFFC8v5zFTiHPb3xKSlqqu7c6qaM2hImJ X-Received: by 2002:a05:6a00:3011:b0:4f6:dca6:ece1 with SMTP id ay17-20020a056a00301100b004f6dca6ece1mr2877191pfb.75.1647490829725; Wed, 16 Mar 2022 21:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647490829; cv=none; d=google.com; s=arc-20160816; b=t/RQ73IFXFl/Dsr+Cz/jBtsO0MoK1UcRXWDBrxeZU0p9HzWsR64nzW7cwfdFx2H91c b8UkjyjJVqHIT1KHpal47h1bdLtaYOb22qWmCVYPhxM1DDVNxJmse0S5WFtqiXPLW8Q4 u5GdVP8sAEaQJdxwcPsXGZMvT0gibMMkf5ZTADrNGRG05CNQ92Vl0u07PWh4f2SsdPbK PmSObosxLsZSepFmw3RDw3Ag7Nd9CdqFzUXMZ6884iUPFAcLqQ0JaQUW0+L/uEVQSs8/ AgYPI0Pc+lq4hwuaE86/UhyjgnFiUWu0S+P0sxEIkHgcI5tgcEn/1rLg8AIIuIY1jZf+ akxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=JZ8EHIBzmOyeWvKgy0ZYkrJEoe2rL78XJxOVNyg56hs=; b=aDCjFMEFacbDiOdk40dIDHGYkCv9e2U8oDGABM4uf+b3dMR1Q+d2njw8St4EwSYuj4 JI1nmWMQ7JMj96rkq9RP1hsmmsinAdFo3aKIDrobx1jv2ND8cKM/9Z5b7JUYIxzHyXOE 0EgAqqFCxZ+778cstxnX7HqH5QIgP+eYQI8HkMMbgkwVKNEBEdvofGTogYNPyOjTLNLg oAFsOAhZSE+htlpdVW+ivpTHHbJFCMG2tI4h0sdp0kClJTkH3WjuK1f6H/1qvYqiaoMn CsDrbEzvn2pWvz60rEmySv9Yctis67yiiT37O7fkeht9dG+wnDUWAoWuXLE8Vsj3PXg3 OouA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rasmusvillemoes.dk header.s=google header.b=AGdot4lN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id l15-20020a170902f68f00b00153f0ce3bfasi538427plg.18.2022.03.16.21.20.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 21:20:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@rasmusvillemoes.dk header.s=google header.b=AGdot4lN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id ECD7ACA0F4; Wed, 16 Mar 2022 20:54:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355122AbiCPK1o (ORCPT + 99 others); Wed, 16 Mar 2022 06:27:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237516AbiCPK1n (ORCPT ); Wed, 16 Mar 2022 06:27:43 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A2025748D for ; Wed, 16 Mar 2022 03:26:27 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 17so2501788lji.1 for ; Wed, 16 Mar 2022 03:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JZ8EHIBzmOyeWvKgy0ZYkrJEoe2rL78XJxOVNyg56hs=; b=AGdot4lN7nfcJfBeLT6Ld2ZE71bnWdLlZxePtqX8WUBQeFH1CSKRlloc26tuKdVPef TM/NFS9rfikGYs6YiK0Zw/RXAnISjmnt2XpIddVhWGUcABPKaML5kgCkj0Xsav0Vf0Ch csre2Iy+NNgIdvwSVHs5E7fajEWxEVk++GIx4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JZ8EHIBzmOyeWvKgy0ZYkrJEoe2rL78XJxOVNyg56hs=; b=1JyVQnJ2O3jEUuwGLsagCvPstWZ/PgIQVdruT1DmOVvDsz82rsjQfmFyRkh6jFe3wU dz6fxyCxgox3QCtyxx7q05vWiZFvVvbNlsEnghUn3w3OFSHFjiH4BIlO2eJrHQAnwFPx pW7EI9Z8eqQPN3hFlvzbxa3x0M8pgiI58HwsBxC/5uWPhFprTQyBU4nkREpfS1cuzOCb 32suCJtJJgN/bdAYTLkKbsYmfwWX/h60acAQPlyCtphWFYrOvBD4V4epH58LP6xrS2fs jS1Eh7TW8VgW6zY+EYrswGf3qqyIAPJc4cYawk69xTqK+ZqCPBD3vUZnNP28kPbyKGG7 MXBQ== X-Gm-Message-State: AOAM531ziCf+z4p52tCcZMNVUWca7RG0O8WhgztxnLyumPUMlv166Vqd VCrFfXI6SXFS3yQ9yv7BeL6W6Q== X-Received: by 2002:a2e:9b8b:0:b0:234:38f3:e85c with SMTP id z11-20020a2e9b8b000000b0023438f3e85cmr19785045lji.452.1647426385725; Wed, 16 Mar 2022 03:26:25 -0700 (PDT) Received: from prevas-ravi.prevas.se ([81.216.59.226]) by smtp.gmail.com with ESMTPSA id u16-20020ac25190000000b004433b80c1d3sm145062lfi.182.2022.03.16.03.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Mar 2022 03:26:25 -0700 (PDT) From: Rasmus Villemoes To: Andrew Morton , Masahiro Yamada Cc: Kyle McMartin , Ingo Molnar , Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [PATCH] kernel/panic.c: remove CONFIG_PANIC_ON_OOPS_VALUE indirection Date: Wed, 16 Mar 2022 11:26:22 +0100 Message-Id: <20220316102622.562572-1-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have the helper IS_ENABLED(). Use that instead of having an unnecessary hidden config option. Signed-off-by: Rasmus Villemoes --- kernel/panic.c | 2 +- lib/Kconfig.debug | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index 55b50e052ec3..304957f5b3c4 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -46,7 +46,7 @@ unsigned int __read_mostly sysctl_oops_all_cpu_backtrace; #endif /* CONFIG_SMP */ -int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE; +int panic_on_oops = IS_ENABLED(CONFIG_PANIC_ON_OOPS); static unsigned long tainted_mask = IS_ENABLED(CONFIG_GCC_PLUGIN_RANDSTRUCT) ? (1 << TAINT_RANDSTRUCT) : 0; static int pause_on_oops; diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 14b89aa37c5c..40211c343a14 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -995,12 +995,6 @@ config PANIC_ON_OOPS Say N if unsure. -config PANIC_ON_OOPS_VALUE - int - range 0 1 - default 0 if !PANIC_ON_OOPS - default 1 if PANIC_ON_OOPS - config PANIC_TIMEOUT int "panic timeout" default 0 -- 2.31.1