浏览代码

kdb: Fix off by one error in kdb_cpu()

There was a follow on replacement patch against the prior
"kgdb: Timeout if secondary CPUs ignore the roundup".

See: https://lkml.org/lkml/2015/1/7/442

This patch is the delta vs the patch that was committed upstream:
  * Fix an off-by-one error in kdb_cpu().
  * Replace NR_CPUS with CONFIG_NR_CPUS to tell checkpatch that we
    really want a static limit.
  * Removed the "KGDB: " prefix from the pr_crit() in debug_core.c
    (kgdb-next contains a patch which introduced pr_fmt() to this file
    to the tag will now be applied automatically).

Cc: Daniel Thompson <daniel.thompson@linaro.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Jason Wessel 10 年之前
父节点
当前提交
df0036d117
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      kernel/debug/debug_core.c
  2. 1 1
      kernel/debug/kdb/kdb_main.c

+ 1 - 1
kernel/debug/debug_core.c

@@ -604,7 +604,7 @@ return_normal:
 		   online_cpus)
 		   online_cpus)
 		cpu_relax();
 		cpu_relax();
 	if (!time_left)
 	if (!time_left)
-		pr_crit("KGDB: Timed out waiting for secondary CPUs.\n");
+		pr_crit("Timed out waiting for secondary CPUs.\n");
 
 
 	/*
 	/*
 	 * At this point the primary processor is completely
 	 * At this point the primary processor is completely

+ 1 - 1
kernel/debug/kdb/kdb_main.c

@@ -2256,7 +2256,7 @@ static int kdb_cpu(int argc, const char **argv)
 	/*
 	/*
 	 * Validate cpunum
 	 * Validate cpunum
 	 */
 	 */
-	if ((cpunum > NR_CPUS) || !kgdb_info[cpunum].enter_kgdb)
+	if ((cpunum >= CONFIG_NR_CPUS) || !kgdb_info[cpunum].enter_kgdb)
 		return KDB_BADCPUNUM;
 		return KDB_BADCPUNUM;
 
 
 	dbg_switch_cpu = cpunum;
 	dbg_switch_cpu = cpunum;