diff --git a/[refs] b/[refs]
index 52ce838221e9..3bb166b6eb19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c74d2bc5a9d43d33d6f16c1e706147162e2bc52
+refs/heads/master: 9ee31f618a3c8209b2bd4bedd71fd5f2be7786bd
diff --git a/trunk/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/trunk/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
index dd8e1ea6e6f2..6cb8d9e6bb6b 100644
--- a/trunk/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
+++ b/trunk/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
@@ -149,6 +149,10 @@ void print_results(int topology_depth, int cpu)
 	unsigned long long result;
 	cstate_t s;
 
+	/* Be careful CPUs may got resorted for pkg value do not just use cpu */
+	if (!bitmask_isbitset(cpus_chosen, cpu_top.core_info[cpu].cpu))
+		return;
+
 	if (topology_depth > 2)
 		printf("%4d|", cpu_top.core_info[cpu].pkg);
 	if (topology_depth > 1)
@@ -389,6 +393,10 @@ int cmd_monitor(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
+	/* Default is: monitor all CPUs */
+	if (bitmask_isallclear(cpus_chosen))
+		bitmask_setall(cpus_chosen);
+
 	dprint("System has up to %d CPU cores\n", cpu_count);
 
 	for (num = 0; all_monitors[num]; num++) {