From 0ac9009ce71ebd3dbf16f060b48c07b7b1b093e4 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 9 Dec 2009 23:57:24 -0800
Subject: [PATCH] --- yaml --- r: 176431 b: refs/heads/master c:
 936cf251787be41833afe2a1e44fbd5fb2adbdb6 h: refs/heads/master i:   176429:
 48168305babdc5b9ff8a4940cc95d3969dc14e56   176427:
 52935c786a364debea7265a57cc2f8b36c1d154d   176423:
 0a57892738471976d7a7738ce1bb5c7b1004cbc5   176415:
 ddbbeabc4f145139554c61bc6101e7ae7f39b128 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc/kernel/kprobes.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 20a47a21eeae..ef27eeee4939 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08a036d583409e3517e3d15b7478d029b25f2cf2
+refs/heads/master: 936cf251787be41833afe2a1e44fbd5fb2adbdb6
diff --git a/trunk/arch/sparc/kernel/kprobes.c b/trunk/arch/sparc/kernel/kprobes.c
index 3bc6527c95af..6716584e48ab 100644
--- a/trunk/arch/sparc/kernel/kprobes.c
+++ b/trunk/arch/sparc/kernel/kprobes.c
@@ -46,6 +46,9 @@ struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};
 
 int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
+	if ((unsigned long) p->addr & 0x3UL)
+		return -EILSEQ;
+
 	p->ainsn.insn[0] = *p->addr;
 	flushi(&p->ainsn.insn[0]);