lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into for-next

Browse Source
This commit is contained in:
Jiri Kosina
2010-08-04 15:14:38 +02:00
parent 73b2c7165b 3a09b1be53
commit d790d4d583
1744 changed files with 34752 additions and 212871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/debug/debug_core.c
View File

@@ -605,13 +605,13 @@ cpu_master_loop:
if (dbg_kdb_mode) {
kgdb_connected = 1;
error = kdb_stub(ks);
kgdb_connected = 0;
} else {
error = gdb_serial_stub(ks);
}
if (error == DBG_PASS_EVENT) {
dbg_kdb_mode = !dbg_kdb_mode;
kgdb_connected = 0;
} else if (error == DBG_SWITCH_CPU_EVENT) {
dbg_cpu_switch(cpu, dbg_switch_cpu);
goto cpu_loop;