---

yaml --- r: 270145 b: refs/heads/master c: c7054aa h: refs/heads/master i: 270143: 751ef2c v: v3
git-mirror · Sep 20, 2011 · 12a742c · 12a742c
1 parent 3769bc9
commit 12a742c
Show file tree

Hide file tree

Showing 5 changed files with 1,222 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a43bc69b39484a448293f2eddc7e98ff15437414
+refs/heads/master: c7054aad538c18bc4c311e74a24cb2e205f02e04
diff --git a/trunk/arch/arm/kernel/Makefile b/trunk/arch/arm/kernel/Makefile
@@ -45,6 +45,9 @@ obj-$(CONFIG_KPROBES)		+= kprobes-arm.o
 endif
 obj-$(CONFIG_ARM_KPROBES_TEST)	+= test-kprobes.o
 test-kprobes-objs		:= kprobes-test.o
+ifdef CONFIG_THUMB2_KERNEL
+test-kprobes-objs		+= kprobes-test-thumb.o
+endif
 obj-$(CONFIG_ATAGS_PROC)	+= atags.o
 obj-$(CONFIG_OABI_COMPAT)	+= sys_oabi-compat.o
 obj-$(CONFIG_ARM_THUMBEE)	+= thumbee.o