summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-08 20:02:31 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-08 20:02:31 -0800
commitdde86f41f4cb13015288abcff4706993c007f65d (patch)
tree2e981cfa9eca8bddd5dcef63957f677ad2f7b15b /tools
parent3b2c67de4650a725654cf9bf36e0025ca10442cd (diff)
parent802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff)
downloadlinux-dde86f41f4cb13015288abcff4706993c007f65d.tar.gz
linux-dde86f41f4cb13015288abcff4706993c007f65d.tar.bz2
linux-dde86f41f4cb13015288abcff4706993c007f65d.zip
Merge v3.13-rc6 into char-misc-next
We want these fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/power/cpupower/utils/cpupower-set.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/power/cpupower/utils/cpupower-set.c b/tools/power/cpupower/utils/cpupower-set.c
index dc4de3762111..bcf1d2f0b791 100644
--- a/tools/power/cpupower/utils/cpupower-set.c
+++ b/tools/power/cpupower/utils/cpupower-set.c
@@ -18,9 +18,9 @@
#include "helpers/bitmask.h"
static struct option set_opts[] = {
- { .name = "perf-bias", .has_arg = optional_argument, .flag = NULL, .val = 'b'},
- { .name = "sched-mc", .has_arg = optional_argument, .flag = NULL, .val = 'm'},
- { .name = "sched-smt", .has_arg = optional_argument, .flag = NULL, .val = 's'},
+ { .name = "perf-bias", .has_arg = required_argument, .flag = NULL, .val = 'b'},
+ { .name = "sched-mc", .has_arg = required_argument, .flag = NULL, .val = 'm'},
+ { .name = "sched-smt", .has_arg = required_argument, .flag = NULL, .val = 's'},
{ },
};