Skip to content

Commit

Permalink
sh: hw-breakpoints: Accept breakpoints on NULL addresses.
Browse files Browse the repository at this point in the history
This follows the x86 change 84d7109
("hw-breakpoints: Accept breakpoints on NULL address") and restores the
previous expected ptrace behaviour.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Mar 1, 2010
1 parent 30ff056 commit 105244e
Showing 1 changed file with 6 additions and 24 deletions.
30 changes: 6 additions & 24 deletions arch/sh/kernel/hw_breakpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,26 +143,6 @@ static int arch_check_va_in_kernelspace(unsigned long va, u8 hbp_len)
return (va >= TASK_SIZE) && ((va + len - 1) >= TASK_SIZE);
}

/*
* Store a breakpoint's encoded address, length, and type.
*/
static int arch_store_info(struct perf_event *bp)
{
struct arch_hw_breakpoint *info = counter_arch_bp(bp);

/*
* User-space requests will always have the address field populated
* For kernel-addresses, either the address or symbol name can be
* specified.
*/
if (info->name)
info->address = (unsigned long)kallsyms_lookup_name(info->name);
if (info->address)
return 0;

return -EINVAL;
}

int arch_bp_generic_fields(int sh_len, int sh_type,
int *gen_len, int *gen_type)
{
Expand Down Expand Up @@ -276,10 +256,12 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp,
return ret;
}

ret = arch_store_info(bp);

if (ret < 0)
return ret;
/*
* For kernel-addresses, either the address or symbol name can be
* specified.
*/
if (info->name)
info->address = (unsigned long)kallsyms_lookup_name(info->name);

/*
* Check that the low-order bits of the address are appropriate
Expand Down

0 comments on commit 105244e

Please sign in to comment.