From ce756798afa352a7350b5e9ab7e7a7782af02523 Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@yxit.co.uk>
Date: Sun, 3 Jul 2011 14:57:18 +0100
Subject: [PATCH] --- yaml --- r: 258365 b: refs/heads/master c:
 6a0d1a1c5692d6192684fb7aa8f4d7f401f8dbab h: refs/heads/master i:   258363:
 a9437f367a11987cb4035b89bb9477d4af58b66a v: v3

---
 [refs]                                |  2 +-
 trunk/arch/arm/kernel/kprobes-thumb.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 35f45c7e4ae5..ee85634ec1b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce715c772f0124f9d3f6f5cffcb85688c81d2c07
+refs/heads/master: 6a0d1a1c5692d6192684fb7aa8f4d7f401f8dbab
diff --git a/trunk/arch/arm/kernel/kprobes-thumb.c b/trunk/arch/arm/kernel/kprobes-thumb.c
index 1677234000b2..6cc51b48762f 100644
--- a/trunk/arch/arm/kernel/kprobes-thumb.c
+++ b/trunk/arch/arm/kernel/kprobes-thumb.c
@@ -509,6 +509,12 @@ const union decode_item kprobe_decode_thumb32_table[] = {
 	 */
 	DECODE_TABLE	(0xfe000000, 0xea000000, t32_table_1110_101x),
 
+	/*
+	 * Coprocessor instructions
+	 *			1110 11xx xxxx xxxx xxxx xxxx xxxx xxxx
+	 */
+	DECODE_REJECT	(0xfc000000, 0xec000000),
+
 	/*
 	 * Data-processing (modified immediate)
 	 *			1111 0x0x xxxx xxxx 0xxx xxxx xxxx xxxx
@@ -527,6 +533,16 @@ const union decode_item kprobe_decode_thumb32_table[] = {
 	 */
 	DECODE_TABLE	(0xf8008000, 0xf0008000, t32_table_1111_0xxx___1),
 
+	/*
+	 * Advanced SIMD element or structure load/store instructions
+	 *			1111 1001 xxx0 xxxx xxxx xxxx xxxx xxxx
+	 */
+	DECODE_REJECT	(0xff100000, 0xf9000000),
+
+	/*
+	 * Coprocessor instructions
+	 *			1111 11xx xxxx xxxx xxxx xxxx xxxx xxxx
+	 */
 	DECODE_END
 };