4 files changed, 4 insertions, 2 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index cca5b545d806..d0e37c9d5f6b 100644
--- a/arch/Kconfig
+++ b/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/kernel/Makefile b/kernel/Makefile
index 8609dd3d875a..2d9de86b7e76 100644
--- a/kernel/Makefile
+++ b/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/kernel/events/Makefile b/kernel/events/Makefile
index 22d901f9caf4..103f5d147b2f 100644
--- a/kernel/events/Makefile
+++ b/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/kernel/uprobes.c b/kernel/events/uprobes.c
index 884817f1b0d3..884817f1b0d3 100644
--- a/kernel/uprobes.c
+++ b/kernel/events/uprobes.c