diff options
| author | Greg Kroah-Hartman | 2014-01-09 05:02:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-01-09 05:02:31 +0100 |
| commit | dde86f41f4cb13015288abcff4706993c007f65d (patch) | |
| tree | 2e981cfa9eca8bddd5dcef63957f677ad2f7b15b /tools | |
| parent | Documentation: HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) ... (diff) | |
| parent | Linux 3.13-rc6 (diff) | |
| download | kernel-qcow2-linux-dde86f41f4cb13015288abcff4706993c007f65d.tar.gz kernel-qcow2-linux-dde86f41f4cb13015288abcff4706993c007f65d.tar.xz kernel-qcow2-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.c | 6 |
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'}, { }, }; |