summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJurica Vukadin <jura@vukad.in>2023-03-07 22:40:39 +0300
committerMasahiro Yamada <masahiroy@kernel.org>2023-03-13 21:46:09 +0300
commitee06a3ef7e3cddb62b90ac40aa661d3c12f7cabc (patch)
tree026d63bbcff874d62bae771b69464357145ad7c6 /scripts
parentced0f245ed951e2b8bd68f79c15238d7dd253662 (diff)
downloadlinux-ee06a3ef7e3cddb62b90ac40aa661d3c12f7cabc.tar.xz
kconfig: Update config changed flag before calling callback
Prior to commit 5ee546594025 ("kconfig: change sym_change_count to a boolean flag"), the conf_updated flag was set to the new value *before* calling the callback. xconfig's save action depends on this behaviour, because xconfig calls conf_get_changed() directly from the callback and now sees the old value, thus never enabling the save button or the shortcut. Restore the previous behaviour. Fixes: 5ee546594025 ("kconfig: change sym_change_count to a boolean flag") Signed-off-by: Jurica Vukadin <jura@vukad.in> Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/confdata.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index b7c9f1dd5e42..992575f1e976 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -1226,10 +1226,12 @@ static void (*conf_changed_callback)(void);
void conf_set_changed(bool val)
{
- if (conf_changed_callback && conf_changed != val)
- conf_changed_callback();
+ bool changed = conf_changed != val;
conf_changed = val;
+
+ if (conf_changed_callback && changed)
+ conf_changed_callback();
}
bool conf_get_changed(void)