diff --git a/[refs] b/[refs]
index 95a4e49780db..421be6805afb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b2d81d48a2d8e37efb6ce7b4d5ef58822b30d89
+refs/heads/master: a5f4374a9610fd7286c2164d4e680436727eff71
diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig
index cca5b545d806..d0e37c9d5f6b 100644
--- a/trunk/arch/Kconfig
+++ b/trunk/arch/Kconfig
@@ -67,7 +67,7 @@ config OPTPROBES
 
 config UPROBES
 	bool "Transparent user-space probes (EXPERIMENTAL)"
-	depends on ARCH_SUPPORTS_UPROBES
+	depends on ARCH_SUPPORTS_UPROBES && PERF_EVENTS
 	default n
 	help
 	  Uprobes is the user-space counterpart to kprobes: they
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
index 8609dd3d875a..2d9de86b7e76 100644
--- a/trunk/kernel/Makefile
+++ b/trunk/kernel/Makefile
@@ -107,7 +107,6 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o
 obj-$(CONFIG_PADATA) += padata.o
 obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
 obj-$(CONFIG_JUMP_LABEL) += jump_label.o
-obj-$(CONFIG_UPROBES) += uprobes.o
 
 $(obj)/configs.o: $(obj)/config_data.h
 
diff --git a/trunk/kernel/events/Makefile b/trunk/kernel/events/Makefile
index 22d901f9caf4..103f5d147b2f 100644
--- a/trunk/kernel/events/Makefile
+++ b/trunk/kernel/events/Makefile
@@ -3,4 +3,7 @@ CFLAGS_REMOVE_core.o = -pg
 endif
 
 obj-y := core.o ring_buffer.o callchain.o
+
 obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
+obj-$(CONFIG_UPROBES) += uprobes.o
+
diff --git a/trunk/kernel/uprobes.c b/trunk/kernel/events/uprobes.c
similarity index 100%
rename from trunk/kernel/uprobes.c
rename to trunk/kernel/events/uprobes.c