diff options
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 0dafba2c1e7d..bd9c6b31a504 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c | |||
| @@ -92,7 +92,6 @@ unsigned int do_ring_perf_limit_reasons; | |||
| 92 | unsigned int crystal_hz; | 92 | unsigned int crystal_hz; |
| 93 | unsigned long long tsc_hz; | 93 | unsigned long long tsc_hz; |
| 94 | int base_cpu; | 94 | int base_cpu; |
| 95 | int do_migrate; | ||
| 96 | double discover_bclk(unsigned int family, unsigned int model); | 95 | double discover_bclk(unsigned int family, unsigned int model); |
| 97 | unsigned int has_hwp; /* IA32_PM_ENABLE, IA32_HWP_CAPABILITIES */ | 96 | unsigned int has_hwp; /* IA32_PM_ENABLE, IA32_HWP_CAPABILITIES */ |
| 98 | /* IA32_HWP_REQUEST, IA32_HWP_STATUS */ | 97 | /* IA32_HWP_REQUEST, IA32_HWP_STATUS */ |
| @@ -303,9 +302,6 @@ int for_all_cpus(int (func)(struct thread_data *, struct core_data *, struct pkg | |||
| 303 | 302 | ||
| 304 | int cpu_migrate(int cpu) | 303 | int cpu_migrate(int cpu) |
| 305 | { | 304 | { |
| 306 | if (!do_migrate) | ||
| 307 | return 0; | ||
| 308 | |||
| 309 | CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set); | 305 | CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set); |
| 310 | CPU_SET_S(cpu, cpu_affinity_setsize, cpu_affinity_set); | 306 | CPU_SET_S(cpu, cpu_affinity_setsize, cpu_affinity_set); |
| 311 | if (sched_setaffinity(0, cpu_affinity_setsize, cpu_affinity_set) == -1) | 307 | if (sched_setaffinity(0, cpu_affinity_setsize, cpu_affinity_set) == -1) |
| @@ -5007,7 +5003,6 @@ void cmdline(int argc, char **argv) | |||
| 5007 | {"hide", required_argument, 0, 'H'}, // meh, -h taken by --help | 5003 | {"hide", required_argument, 0, 'H'}, // meh, -h taken by --help |
| 5008 | {"Joules", no_argument, 0, 'J'}, | 5004 | {"Joules", no_argument, 0, 'J'}, |
| 5009 | {"list", no_argument, 0, 'l'}, | 5005 | {"list", no_argument, 0, 'l'}, |
| 5010 | {"migrate", no_argument, 0, 'm'}, | ||
| 5011 | {"out", required_argument, 0, 'o'}, | 5006 | {"out", required_argument, 0, 'o'}, |
| 5012 | {"quiet", no_argument, 0, 'q'}, | 5007 | {"quiet", no_argument, 0, 'q'}, |
| 5013 | {"show", required_argument, 0, 's'}, | 5008 | {"show", required_argument, 0, 's'}, |
| @@ -5019,7 +5014,7 @@ void cmdline(int argc, char **argv) | |||
| 5019 | 5014 | ||
| 5020 | progname = argv[0]; | 5015 | progname = argv[0]; |
| 5021 | 5016 | ||
| 5022 | while ((opt = getopt_long_only(argc, argv, "+C:c:Ddhi:Jmo:qST:v", | 5017 | while ((opt = getopt_long_only(argc, argv, "+C:c:Ddhi:JM:m:o:qST:v", |
| 5023 | long_options, &option_index)) != -1) { | 5018 | long_options, &option_index)) != -1) { |
| 5024 | switch (opt) { | 5019 | switch (opt) { |
| 5025 | case 'a': | 5020 | case 'a': |
| @@ -5062,9 +5057,6 @@ void cmdline(int argc, char **argv) | |||
| 5062 | list_header_only++; | 5057 | list_header_only++; |
| 5063 | quiet++; | 5058 | quiet++; |
| 5064 | break; | 5059 | break; |
| 5065 | case 'm': | ||
| 5066 | do_migrate = 1; | ||
| 5067 | break; | ||
| 5068 | case 'o': | 5060 | case 'o': |
| 5069 | outf = fopen_or_die(optarg, "w"); | 5061 | outf = fopen_or_die(optarg, "w"); |
| 5070 | break; | 5062 | break; |
