kdb,debug_core: adjust master cpu switch logic against new debug_core locking

[net-next-2.6.git] / kernel / debug / kdb / kdb_main.c

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 4226f32517d178f2330e97b0acb92f78f97013ce..d7bda21a106b572ee95c22fd1e59524914944ed4 100644 (file)
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -1749,13 +1749,13 @@ static int kdb_go(int argc, const char **argv)
        int nextarg;
        long offset;
 
+       if (raw_smp_processor_id() != kdb_initial_cpu) {
+               kdb_printf("go must execute on the entry cpu, "
+                          "please use \"cpu %d\" and then execute go\n",
+                          kdb_initial_cpu);
+               return KDB_BADCPUNUM;
+       }
        if (argc == 1) {
-               if (raw_smp_processor_id() != kdb_initial_cpu) {
-                       kdb_printf("go <address> must be issued from the "
-                                  "initial cpu, do cpu %d first\n",
-                                  kdb_initial_cpu);
-                       return KDB_ARGCOUNT;
-               }
                nextarg = 1;
                diag = kdbgetaddrarg(argc, argv, &nextarg,
                                     &addr, &offset, NULL);