---

yaml --- r: 258330 b: refs/heads/master c: 856bc35 h: refs/heads/master v: v3
git-mirror · Jul 13, 2011 · 893e4f0 · 893e4f0
1 parent 04bbeb3
commit 893e4f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2437170710c4a3dee137a65623960aa7ac82a32e
+refs/heads/master: 856bc356394a28edb8c388e31212f6ceb0a04ce6
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -10,7 +10,7 @@ config ARM
 	select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
 	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
 	select HAVE_ARCH_KGDB
-	select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL)
+	select HAVE_KPROBES if !XIP_KERNEL
 	select HAVE_KRETPROBES if (HAVE_KPROBES)
 	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
 	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)