Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 29 Apr 2021 16:00:17 +1000
Message-Id: <20210429155950.v2.1.I2392cf11fb353d10459958100b69d93346fa167c@changeid>
Mime-Version: 1.0
Subject: [PATCH v2] x86: Add a prompt for HPET_EMULATE_RTC
From:   Anand K Mistry <amistry@google.com>
To:     x86@kernel.org
Cc:     Anand K Mistry <amistry@google.com>,
        Borislav Petkov <bp@alien8.de>,
        "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

This does two things:
1. Makes the option visible in menuconfig, allowing the user to easily
   disable this option
2. Allows olddefconfig to respect the option if it is set in the old
   .config file

It's not clear exactly why the second consequence is true, but it
appears to be because when the conf tool reads the config file, it only
respects the existing setting if the option is "visible" (see
scripts/kconfig/symbol.c:381).

Signed-off-by: Anand K Mistry <amistry@google.com>
---
This patch was previously discussed at
https://lore.kernel.org/lkml/20210204132043.1.I2392cf11fb353d10459958100b69d93346fa167c@changeid/
Sending as a v2 because a merge conflict exists with commit
3228e1dc80983 ("x86/Kconfig: Remove HPET_EMULATE_RTC depends on RTC")

Changes in v2:
- Rebase
- Fix typo in commit message

 arch/x86/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0fc82237414d..55e652aa42d1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -896,6 +896,7 @@ config HPET_TIMER
 
 config HPET_EMULATE_RTC
 	def_bool y
+	prompt "HPET RTC emulation"
 	depends on HPET_TIMER && (RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)
 
 # Mark as expert because too many people got it wrong.
-- 
2.31.1.498.g6c1eba8ee3d-goog