| Message ID | 1454951267-30034-2-git-send-email-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 08.02.16 at 18:07, <andrew.cooper3@citrix.com> wrote: > --- a/xen/common/kernel.c > +++ b/xen/common/kernel.c > @@ -121,12 +121,11 @@ void __init cmdline_parse(const char *cmdline) > simple_strtoll(optval, NULL, 0)); > break; > case OPT_BOOL: > - case OPT_INVBOOL: > if ( !parse_bool(optval) ) > bool_assert = !bool_assert; > assign_integer_param( > param, > - (param->type == OPT_BOOL) == bool_assert); > + bool_assert); This function invocation should now really become a single line. See patch 1 for my condition for providing an ack here. Jan
diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 6a3196a..af6e563 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -121,12 +121,11 @@ void __init cmdline_parse(const char *cmdline) simple_strtoll(optval, NULL, 0)); break; case OPT_BOOL: - case OPT_INVBOOL: if ( !parse_bool(optval) ) bool_assert = !bool_assert; assign_integer_param( param, - (param->type == OPT_BOOL) == bool_assert); + bool_assert); break; case OPT_SIZE: assign_integer_param( diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index 7072013..6081102 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -78,7 +78,6 @@ struct kernel_param { OPT_STR, OPT_UINT, OPT_BOOL, - OPT_INVBOOL, OPT_SIZE, OPT_CUSTOM } type; @@ -98,10 +97,6 @@ extern struct kernel_param __setup_start, __setup_end; __setup_str __setup_str_##_var[] = _name; \ __kparam __setup_##_var = \ { __setup_str_##_var, OPT_BOOL, &_var, sizeof(_var) } -#define invbool_param(_name, _var) \ - __setup_str __setup_str_##_var[] = _name; \ - __kparam __setup_##_var = \ - { __setup_str_##_var, OPT_INVBOOL, &_var, sizeof(_var) } #define integer_param(_name, _var) \ __setup_str __setup_str_##_var[] = _name; \ __kparam __setup_##_var = \
There are now no users. No functional change. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Tim Deegan <tim@xen.org> CC: Ian Campbell <Ian.Campbell@citrix.com> --- xen/common/kernel.c | 3 +-- xen/include/xen/init.h | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-)