diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
| commit | 450cdfa9c5713551ab1438ab210679868b52a994 (patch) | |
| tree | edd98f9698aa88af55a3a1ee3de62e52917c39ba /tools | |
| parent | bf78886fb6c4131885f84f3eaaf7474509d40e51 (diff) | |
| parent | 8b4ed85b8404ffe7e10ee410c4df3968b86f0793 (diff) | |
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
Conflicts:
arch/arm64/kernel/smp.c
Signed-off-by: Alex Shi <alex.shi@linaro.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 dc4de376211..bcf1d2f0b79 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'}, { }, }; |