From ad5d669ebf761124b7910afed5b9e93114e96f8d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 11 Aug 2013 17:41:56 +0000
Subject: [PATCH] trace: Enable UPROBES, UPROBE_EVENT (Closes: #691167)

svn path=/dists/trunk/linux/; revision=20481
---
 debian/changelog     | 1 +
 debian/config/config | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e372f61d..396940927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux (3.11~rc4-1~exp2) UNRELEASED; urgency=low
 
   * [arm,mips,s390,sh4] Enable KPROBES
   * trace: Enable KPROBE_EVENT (Closes: #640953)
+  * trace: Enable UPROBES, UPROBE_EVENT (Closes: #691167)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 11 Aug 2013 19:34:47 +0200
 
diff --git a/debian/config/config b/debian/config/config
index 1865e4599..c250efa38 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2,6 +2,7 @@
 ## file: arch/Kconfig
 ##
 CONFIG_KPROBES=y
+CONFIG_UPROBES=y
 
 ##
 ## file: block/Kconfig
@@ -4353,6 +4354,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_BENCHMARK is not set