Skip to content
  • Dirk Gouders's avatar
    kconfig: fix line numbers for if-entries in menu tree · 2f9e98db
    Dirk Gouders authored
    [ Upstream commit b2d00d7c ]
    
    The line numers for if-entries in the menu tree are off by one or more
    lines which is confusing when debugging for correctness of unrelated changes.
    
    According to the git log, commit a02f0570
    
     (kconfig: improve
    error handling in the parser) was the last one that changed that part
    of the parser and replaced
    
    	"if_entry: T_IF expr T_EOL"
    by
    	"if_entry: T_IF expr nl"
    
    but the commit message does not state why this has been done.
    
    When reverting that part of the commit, only the line numers are
    corrected (checked with cdebug = DEBUG_PARSE in zconf.y), otherwise
    the menu tree remains unchanged (checked with zconfdump() enabled in
    conf.c).
    
    An example for the corrected line numbers:
    
    drivers/soc/Kconfig:15:source drivers/soc/tegra/Kconfig
    drivers/soc/tegra/Kconfig:4:if
    drivers/soc/tegra/Kconfig:6:if
    
    changes to:
    
    drivers/soc/Kconfig:15:source drivers/soc/tegra/Kconfig
    drivers/soc/tegra/Kconfig:1:if
    drivers/soc/tegra/Kconfig:4:if
    
    Signed-off-by: default avatarDirk Gouders <dirk@gouders.net>
    Signed-off-by: Masahiro Yamada's avatarMasahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    2f9e98db