Commit 105244ec authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: hw-breakpoints: Accept breakpoints on NULL addresses. 



This follows the x86 change 84d71092
("hw-breakpoints: Accept breakpoints on NULL address") and restores the
previous expected ptrace behaviour.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 30ff056c

arch/sh/kernel/hw_breakpoint.c

+6 −24
Original line number Diff line number Diff line
@@ -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