powerpc/ptrace: move ptrace_triggered() into hw_breakpoint.c (ccbed90b) · Commits · 戴 / test

arch/powerpc/kernel/hw_breakpoint.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -429,3 +429,19 @@ void hw_breakpoint_pmu_read(struct perf_event *bp)
		{
		/* TODO */
		}

		void ptrace_triggered(struct perf_event *bp,
		struct perf_sample_data data, struct pt_regs regs)
		{
		struct perf_event_attr attr;

		/*
		* Disable the breakpoint request here since ptrace has defined a
		* one-shot behaviour for breakpoint exceptions in PPC64.
		* The SIGTRAP signal is generated automatically for us in do_dabr().
		* We don't have to do anything about that here
		*/
		attr = bp->attr;
		attr.disabled = true;
		modify_user_hw_breakpoint(bp, &attr);
		}

+0 −19

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		#include <linux/regset.h>
		#include <linux/tracehook.h>
		#include <linux/audit.h>
		#include <linux/hw_breakpoint.h>
		#include <linux/context_tracking.h>
		#include <linux/syscalls.h>

		@@ -31,24 +30,6 @@

		#include "ptrace-decl.h"

		#ifdef CONFIG_HAVE_HW_BREAKPOINT
		void ptrace_triggered(struct perf_event *bp,
		struct perf_sample_data data, struct pt_regs regs)
		{
		struct perf_event_attr attr;

		/*
		* Disable the breakpoint request here since ptrace has defined a
		* one-shot behaviour for breakpoint exceptions in PPC64.
		* The SIGTRAP signal is generated automatically for us in do_dabr().
		* We don't have to do anything about that here
		*/
		attr = bp->attr;
		attr.disabled = true;
		modify_user_hw_breakpoint(bp, &attr);
		}
		#endif /* CONFIG_HAVE_HW_BREAKPOINT */

		/*
		* Called by kernel/ptrace.c when detaching..
		*