diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2020-12-10 06:51:50 (GMT) |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2021-02-02 07:06:32 (GMT) |
| commit | acce58834d83602b5c97cb01f04c9f540e40792b (patch) | |
| tree | d672f90c8bd4276c41369265a54cbb60d0d5a521 /kconfig/expr.c | |
| parent | 31695dd2b00fc3daac109324992901fdcd6068e5 (diff) | |
kconfig: Sync with upstream v5.5
This commit introduces the following upstream changes:
272a72103012 kconfig: don't crash on NULL expressions in expr_eq()
46b2afa6890d kconfig: be more helpful if pkg-config is missing
5d8b42aa7ccb kconfig: Add option to get the full help text with listnewconfig
a64c0440dda1 kbuild: Wrap long "make help" text lines
521b29b6ff53 kconfig: split util.c out of parser.y
60bef52c7a68 merge_config.sh: ignore unwanted grep errors
54b8ae66ae1a kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
1634f2bfdb84 kbuild: remove clean-dirs syntax
cdfca821571d merge_config.sh: Check error codes from make
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'kconfig/expr.c')
| -rw-r--r-- | kconfig/expr.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kconfig/expr.c b/kconfig/expr.c index 77ffff3..9f1de58 100644 --- a/kconfig/expr.c +++ b/kconfig/expr.c @@ -254,6 +254,13 @@ static int expr_eq(struct expr *e1, struct expr *e2) { int res, old_count; + /* + * A NULL expr is taken to be yes, but there's also a different way to + * represent yes. expr_is_yes() checks for either representation. + */ + if (!e1 || !e2) + return expr_is_yes(e1) && expr_is_yes(e2); + if (e1->type != e2->type) return 0; switch (e1->type) { |