summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-07 00:26:11 -0700
committerChris Wright <chrisw@sous-sol.org>2008-04-18 18:53:27 -0700
commit3923d91d2ade70e9fcfe22aa965710ff8a2ae535 (patch)
treedeb3820c7ad2699960bbbd039a60a3e9e2ca1bc2
parent8b337d60a526f4461d681cd537d6b0f2d176f0ad (diff)
SPARC64: flush_ptrace_access() needs preemption disable.
Upstream commit: f6a843d939ade435e060d580f5c56d958464f8a5 Based upon a report by Mariusz Kozlowski. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-rw-r--r--arch/sparc64/kernel/ptrace.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 81111a12f0a8..d4af13166ef8 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -127,6 +127,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
if (tlb_type == hypervisor)
return;
+ preempt_disable();
+
#ifdef DCACHE_ALIASING_POSSIBLE
/* If bit 13 of the kernel address we used to access the
* user page is the same as the virtual address that page
@@ -165,6 +167,8 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
for (; start < end; start += icache_line_size)
flushi(start);
}
+
+ preempt_enable();
}
asmlinkage void do_ptrace(struct pt_regs *regs)