diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-03-01 11:52:03 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-01 11:52:03 +0900 |
| commit | 105244ec95590f5f12a90d974650ab5c7bc8ec79 (patch) | |
| tree | d7f5617900a8b5cdab6a9e5bb714a8b1c3533650 /arch/sh | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
| download | op-kernel-dev-105244ec95590f5f12a90d974650ab5c7bc8ec79.zip op-kernel-dev-105244ec95590f5f12a90d974650ab5c7bc8ec79.tar.gz | |
sh: hw-breakpoints: Accept breakpoints on NULL addresses.
This follows the x86 change 84d710926797a6e317e7e94654a3ccd771cfd8a3
("hw-breakpoints: Accept breakpoints on NULL address") and restores the
previous expected ptrace behaviour.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/hw_breakpoint.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/arch/sh/kernel/hw_breakpoint.c b/arch/sh/kernel/hw_breakpoint.c index e2f1753..675eea7 100644 --- a/arch/sh/kernel/hw_breakpoint.c +++ b/arch/sh/kernel/hw_breakpoint.c @@ -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) { @@ -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 |
