Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 174879
b: refs/heads/master
c: 7f8b7ed
h: refs/heads/master
i:
  174877: b5d1ac7
  174875: 274bd96
  174871: fbf86b9
  174863: 1d36aad
  174847: e0e0ec0
v: v3
  • Loading branch information
Jason Wessel committed Dec 11, 2009
1 parent b14e342 commit c56519a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d625e9c0d706eb43afbf52634d5cecacae1d57cc
refs/heads/master: 7f8b7ed6f825c729332b8190aca55c6bf95b158e
23 changes: 15 additions & 8 deletions trunk/kernel/kgdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,8 @@ static void kgdb_flush_swbreak_addr(unsigned long addr)
static int kgdb_activate_sw_breakpoints(void)
{
unsigned long addr;
int error = 0;
int error;
int ret = 0;
int i;

for (i = 0; i < KGDB_MAX_BREAKPOINTS; i++) {
Expand All @@ -635,13 +636,16 @@ static int kgdb_activate_sw_breakpoints(void)
addr = kgdb_break[i].bpt_addr;
error = kgdb_arch_set_breakpoint(addr,
kgdb_break[i].saved_instr);
if (error)
return error;
if (error) {
ret = error;
printk(KERN_INFO "KGDB: BP install failed: %lx", addr);
continue;
}

kgdb_flush_swbreak_addr(addr);
kgdb_break[i].state = BP_ACTIVE;
}
return 0;
return ret;
}

static int kgdb_set_sw_break(unsigned long addr)
Expand Down Expand Up @@ -688,7 +692,8 @@ static int kgdb_set_sw_break(unsigned long addr)
static int kgdb_deactivate_sw_breakpoints(void)
{
unsigned long addr;
int error = 0;
int error;
int ret = 0;
int i;

for (i = 0; i < KGDB_MAX_BREAKPOINTS; i++) {
Expand All @@ -697,13 +702,15 @@ static int kgdb_deactivate_sw_breakpoints(void)
addr = kgdb_break[i].bpt_addr;
error = kgdb_arch_remove_breakpoint(addr,
kgdb_break[i].saved_instr);
if (error)
return error;
if (error) {
printk(KERN_INFO "KGDB: BP remove failed: %lx\n", addr);
ret = error;
}

kgdb_flush_swbreak_addr(addr);
kgdb_break[i].state = BP_SET;
}
return 0;
return ret;
}

static int kgdb_remove_sw_break(unsigned long addr)
Expand Down

0 comments on commit c56519a

Please sign in to comment.