git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
scripts
/
kconfig
/
menu.c
diff --git
a/scripts/kconfig/menu.c
b/scripts/kconfig/menu.c
index
5f77dcb
..
5fdf10d
100644
(file)
--- a/
scripts/kconfig/menu.c
+++ b/
scripts/kconfig/menu.c
@@
-203,7
+203,7
@@
void menu_add_option(int token, char *arg)
}
}
}
}
-static int menu_
range_valid_sym
(struct symbol *sym, struct symbol *sym2)
+static int menu_
validate_number
(struct symbol *sym, struct symbol *sym2)
{
return sym2->type == S_INT || sym2->type == S_HEX ||
(sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name));
{
return sym2->type == S_INT || sym2->type == S_HEX ||
(sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name));
@@
-221,6
+221,15
@@
static void sym_check_prop(struct symbol *sym)
prop_warn(prop,
"default for config symbol '%s'"
" must be a single symbol", sym->name);
prop_warn(prop,
"default for config symbol '%s'"
" must be a single symbol", sym->name);
+ if (prop->expr->type != E_SYMBOL)
+ break;
+ sym2 = prop_get_symbol(prop);
+ if (sym->type == S_HEX || sym->type == S_INT) {
+ if (!menu_validate_number(sym, sym2))
+ prop_warn(prop,
+ "'%s': number is invalid",
+ sym->name);
+ }
break;
case P_SELECT:
sym2 = prop_get_symbol(prop);
break;
case P_SELECT:
sym2 = prop_get_symbol(prop);
@@
-240,8
+249,8
@@
static void sym_check_prop(struct symbol *sym)
if (sym->type != S_INT && sym->type != S_HEX)
prop_warn(prop, "range is only allowed "
"for int or hex symbols");
if (sym->type != S_INT && sym->type != S_HEX)
prop_warn(prop, "range is only allowed "
"for int or hex symbols");
- if (!menu_
range_valid_sym
(sym, prop->expr->left.sym) ||
- !menu_
range_valid_sym
(sym, prop->expr->right.sym))
+ if (!menu_
validate_number
(sym, prop->expr->left.sym) ||
+ !menu_
validate_number
(sym, prop->expr->right.sym))
prop_warn(prop, "range is invalid");
break;
default:
prop_warn(prop, "range is invalid");
break;
default: