From da659f9a32201638b2bf2529c03ee4439cbd6715 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 11 Aug 2013 17:38:12 +0000
Subject: [PATCH] Enable KPROBES at top level

This enables it for the arm*, mips*, s390 and sh4 ports.
Keep it disabled for the reduced armel images.

svn path=/dists/trunk/linux/; revision=20479
---
 debian/changelog                    | 6 ++++++
 debian/config/armel/config-reduced  | 5 +++++
 debian/config/config                | 5 +++++
 debian/config/ia64/config           | 1 -
 debian/config/kernelarch-x86/config | 1 -
 debian/config/powerpc/config        | 1 -
 debian/config/sparc/config          | 5 -----
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69407c0e7..ec7deba0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux (3.11~rc4-1~exp2) UNRELEASED; urgency=low
+
+  * [arm,mips,s390,sh4] Enable KPROBES
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 11 Aug 2013 19:34:47 +0200
+
 linux (3.11~rc4-1~exp1) experimental; urgency=low
 
   * New upstream release candidate
diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced
index 6fea3d85c..b6933e3db 100644
--- a/debian/config/armel/config-reduced
+++ b/debian/config/armel/config-reduced
@@ -1,3 +1,8 @@
+##
+## file: arch/Kconfig
+##
+# CONFIG_KPROBES is not set
+
 ##
 ## file: arch/arm/Kconfig
 ##
diff --git a/debian/config/config b/debian/config/config
index 9f574da33..abd521d2f 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1,3 +1,8 @@
+##
+## file: arch/Kconfig
+##
+CONFIG_KPROBES=y
+
 ##
 ## file: block/Kconfig
 ##
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 332d3a6aa..59984feec 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -2,7 +2,6 @@
 ## file: arch/Kconfig
 ##
 CONFIG_OPROFILE=m
-CONFIG_KPROBES=y
 
 ##
 ## file: arch/ia64/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index c596ec068..e1b3898f5 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -3,7 +3,6 @@
 ##
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_KPROBES=y
 
 ##
 ## file: arch/x86/Kconfig
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index fc6d74d83..7e6c44a35 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -2,7 +2,6 @@
 ## file: arch/Kconfig
 ##
 CONFIG_OPROFILE=m
-CONFIG_KPROBES=y
 
 ##
 ## file: arch/powerpc/Kconfig
diff --git a/debian/config/sparc/config b/debian/config/sparc/config
index ba5397f01..a77217c6c 100644
--- a/debian/config/sparc/config
+++ b/debian/config/sparc/config
@@ -1,8 +1,3 @@
-##
-## file: arch/Kconfig
-##
-CONFIG_KPROBES=y
-
 ##
 ## file: arch/sparc/Kconfig
 ##