mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: kgdb: Always process the whole breakpoint list on activate or deactivate kgdb: continue and warn on signal passing from gdb kgdb,x86: do not set kgdb_single_step on x86 kgdb: allow for cpu switch when single stepping kgdb,i386: Fix corner case access to ss with NMI watch dog exception kgdb: Replace strstr() by strchr() for single-character needles kgdbts: Read buffer overflow kgdb: Read buffer overflow kgdb,x86: remove redundant test
This commit is contained in:
commit
880188b243
3 changed files with 59 additions and 25 deletions
|
|
@ -712,6 +712,12 @@ static int run_simple_test(int is_get_char, int chr)
|
|||
|
||||
/* End of packet == #XX so look for the '#' */
|
||||
if (put_buf_cnt > 3 && put_buf[put_buf_cnt - 3] == '#') {
|
||||
if (put_buf_cnt >= BUFMAX) {
|
||||
eprintk("kgdbts: ERROR: put buffer overflow on"
|
||||
" '%s' line %i\n", ts.name, ts.idx);
|
||||
put_buf_cnt = 0;
|
||||
return 0;
|
||||
}
|
||||
put_buf[put_buf_cnt] = '\0';
|
||||
v2printk("put%i: %s\n", ts.idx, put_buf);
|
||||
/* Trigger check here */
|
||||
|
|
@ -885,16 +891,16 @@ static void kgdbts_run_tests(void)
|
|||
int nmi_sleep = 0;
|
||||
int i;
|
||||
|
||||
ptr = strstr(config, "F");
|
||||
ptr = strchr(config, 'F');
|
||||
if (ptr)
|
||||
fork_test = simple_strtol(ptr + 1, NULL, 10);
|
||||
ptr = strstr(config, "S");
|
||||
ptr = strchr(config, 'S');
|
||||
if (ptr)
|
||||
do_sys_open_test = simple_strtol(ptr + 1, NULL, 10);
|
||||
ptr = strstr(config, "N");
|
||||
ptr = strchr(config, 'N');
|
||||
if (ptr)
|
||||
nmi_sleep = simple_strtol(ptr+1, NULL, 10);
|
||||
ptr = strstr(config, "I");
|
||||
ptr = strchr(config, 'I');
|
||||
if (ptr)
|
||||
sstep_test = simple_strtol(ptr+1, NULL, 10);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue