Skip to content

Commit

Permalink
Merge pull request riscv-collab#969 from aap-sc/aap-sc/final_november…
Browse files Browse the repository at this point in the history
…_2023_upstream_sync_fixup

fix erroneously-resolved merge conflict
  • Loading branch information
timsifive authored Nov 30, 2023
2 parents e9484ba + 10af616 commit d4c5d26
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/target/breakpoints.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ int watchpoint_remove(struct target *target, target_addr_t address)
num_found_watchpoints++;

if (status != ERROR_OK) {
LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address);
LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address);
retval = status;
}
}
Expand All @@ -635,7 +635,7 @@ int watchpoint_remove(struct target *target, target_addr_t address)
num_found_watchpoints++;

if (retval != ERROR_OK)
LOG_TARGET_ERROR(target, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address);
LOG_TARGET_ERROR(target, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address);
}
}

Expand Down

0 comments on commit d4c5d26

Please sign in to comment.