diff --git a/debian/changelog b/debian/changelog
index 8d230b9bc..4f449c6e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ linux-2.6 (2.6.32-16) UNRELEASED; urgency=low
     (Closes: #514646)
   * Add stable 2.6.32.16-rc1
   * Add drm changes from stable 2.6.33.6-rc1
+  * [ia64, powerpc, sparc, x86] Enable KPROBES and KRETPROBES
+    (Closes: #584130)
 
   [ Aurelien Jarno ]
   * [sh4] fix sh_tmu clocksource following recent nohz changes.
diff --git a/debian/config/defines b/debian/config/defines
index 5ce529731..51a1699d3 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -14,6 +14,12 @@ ignore-changes: module:arch/x86/kvm/kvm
  ide_timing_compute
  ide_timing_find_mode
  ide_timing_merge
+# Can't see any OOT users of these
+ __srcu_notifier_call_chain
+ srcu_init_notifier_head
+ srcu_notifier_call_chain
+ srcu_notifier_chain_register
+ srcu_notifier_chain_unregister
 
 [base]
 arches:
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 7900b7eca..f9e2bf620 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -2,6 +2,8 @@
 ## file: arch/Kconfig
 ##
 CONFIG_OPROFILE=m
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
 
 ##
 ## file: arch/ia64/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 15cdad5bf..ff49b05b9 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -4,7 +4,8 @@
 CONFIG_OPROFILE=m
 CONFIG_OPROFILE_IBS=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
 
 ##
 ## file: arch/x86/Kconfig
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index c8e05f256..7fe2d7d7b 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -2,6 +2,8 @@
 ## file: arch/Kconfig
 ##
 CONFIG_OPROFILE=m
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
 
 ##
 ## file: arch/powerpc/Kconfig
diff --git a/debian/config/sparc/config b/debian/config/sparc/config
index 444b2c555..e6cf6c787 100644
--- a/debian/config/sparc/config
+++ b/debian/config/sparc/config
@@ -1,3 +1,9 @@
+##
+## file: arch/Kconfig
+##
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
+
 ##
 ## file: arch/sparc/Kconfig
 ##