[kernel] r15927 - in dists/sid/linux-2.6/debian: . config config/ia64 config/kernelarch-x86 config/powerpc config/sparc

[Ben Hutchings]

Author: benh
Date: Fri Jul  2 21:43:27 2010
New Revision: 15927

Log:
[ia64, powerpc, sparc, x86] Enable KPROBES and KRETPROBES (Closes: #584130)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/defines
   dists/sid/linux-2.6/debian/config/ia64/config
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config
   dists/sid/linux-2.6/debian/config/powerpc/config
   dists/sid/linux-2.6/debian/config/sparc/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Jul  2 03:46:06 2010	(r15926)
+++ dists/sid/linux-2.6/debian/changelog	Fri Jul  2 21:43:27 2010	(r15927)
@@ -44,6 +44,8 @@
     (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.

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Fri Jul  2 03:46:06 2010	(r15926)
+++ dists/sid/linux-2.6/debian/config/defines	Fri Jul  2 21:43:27 2010	(r15927)
@@ -14,6 +14,12 @@
  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:

Modified: dists/sid/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/ia64/config	Fri Jul  2 03:46:06 2010	(r15926)
+++ dists/sid/linux-2.6/debian/config/ia64/config	Fri Jul  2 21:43:27 2010	(r15927)
@@ -2,6 +2,8 @@
 ## file: arch/Kconfig
 ##
 CONFIG_OPROFILE=m
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
 
 ##
 ## file: arch/ia64/Kconfig

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Fri Jul  2 03:46:06 2010	(r15926)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Fri Jul  2 21:43:27 2010	(r15927)
@@ -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

Modified: dists/sid/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config	Fri Jul  2 03:46:06 2010	(r15926)
+++ dists/sid/linux-2.6/debian/config/powerpc/config	Fri Jul  2 21:43:27 2010	(r15927)
@@ -2,6 +2,8 @@
 ## file: arch/Kconfig
 ##
 CONFIG_OPROFILE=m
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
 
 ##
 ## file: arch/powerpc/Kconfig

Modified: dists/sid/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/sparc/config	Fri Jul  2 03:46:06 2010	(r15926)
+++ dists/sid/linux-2.6/debian/config/sparc/config	Fri Jul  2 21:43:27 2010	(r15927)
@@ -1,4 +1,10 @@
 ##
+## file: arch/Kconfig
+##
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
+
+##
 ## file: arch/sparc/Kconfig
 ##
 CONFIG_64BIT=y