Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d613d828e8987a1f794378022f900b454fa95403

Authored by Jason Wessel
1 parent f679c4985b
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

kdb: Remove all references to DOING_KGDB2 

The DOING_KGDB2 was originally a state variable for one of the two
ways to automatically transition from kdb to kgdb.  Purge all these
variables and just use one single state for the transition.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>

Showing 4 changed files with 3 additions and 7 deletions Side-by-side Diff

kernel/debug/kdb/kdb_debugger.c
Diff comments   View file @ d613d82
... ... @@ -126,10 +126,8 @@
126 126 KDB_STATE_CLEAR(PAGER);
127 127 kdbnearsym_cleanup();
128 128 if (error == KDB_CMD_KGDB) {
129   - if (KDB_STATE(DOING_KGDB) || KDB_STATE(DOING_KGDB2)) {
  129 + if (KDB_STATE(DOING_KGDB))
130 130 KDB_STATE_CLEAR(DOING_KGDB);
131   - KDB_STATE_CLEAR(DOING_KGDB2);
132   - }
133 131 return DBG_PASS_EVENT;
134 132 }
135 133 kdb_bp_install(ks->linux_regs);
kernel/debug/kdb/kdb_io.c
Diff comments   View file @ d613d82
... ... @@ -399,7 +399,7 @@
399 399 strcmp(lastchar - 11, "$qSupported") == 0) {
400 400 kdb_gdb_state_pass(lastchar - 11);
401 401 strcpy(buffer, "kgdb");
402   - KDB_STATE_SET(DOING_KGDB2);
  402 + KDB_STATE_SET(DOING_KGDB);
403 403 return buffer;
404 404 }
405 405 }
kernel/debug/kdb/kdb_main.c
Diff comments   View file @ d613d82
... ... @@ -1386,7 +1386,7 @@
1386 1386 }
1387 1387  
1388 1388 if (result == KDB_CMD_KGDB) {
1389   - if (!(KDB_STATE(DOING_KGDB) || KDB_STATE(DOING_KGDB2)))
  1389 + if (!KDB_STATE(DOING_KGDB))
1390 1390 kdb_printf("Entering please attach debugger "
1391 1391 "or use $D#44+ or $3#33\n");
1392 1392 break;
kernel/debug/kdb/kdb_private.h
Diff comments   View file @ d613d82
... ... @@ -21,7 +21,6 @@
21 21 #define KDB_CMD_SS (-1003)
22 22 #define KDB_CMD_SSB (-1004)
23 23 #define KDB_CMD_KGDB (-1005)
24   -#define KDB_CMD_KGDB2 (-1006)
25 24  
26 25 /* Internal debug flags */
27 26 #define KDB_DEBUG_FLAG_BP 0x0002 /* Breakpoint subsystem debug */
... ... @@ -146,7 +145,6 @@
146 145 * keyboard on this cpu */
147 146 #define KDB_STATE_KEXEC 0x00040000 /* kexec issued */
148 147 #define KDB_STATE_DOING_KGDB 0x00080000 /* kgdb enter now issued */
149   -#define KDB_STATE_DOING_KGDB2 0x00100000 /* kgdb enter now issued */
150 148 #define KDB_STATE_KGDB_TRANS 0x00200000 /* Transition to kgdb */
151 149 #define KDB_STATE_ARCH 0xff000000 /* Reserved for arch
152 150 * specific use */