[kernel] r14511 - in dists/trunk/linux-2.6/debian: . config config/kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Fri Oct 30 08:31:01 2009
New Revision: 14511

Log:
* debian/changelog: Update.
* debian/config/config: Enable PERF_EVENTS and EVENT_PROFILE.
* debian/config/kernelarch-x86/config: Remove old option.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Oct 30 08:19:56 2009	(r14510)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Oct 30 08:31:01 2009	(r14511)
@@ -8,6 +8,7 @@
   [ Bastian Blank ]
   * [mips] Don't force EMBEDDED on.
   * [sparc] Don't builtin Ext2 support.
+  * Enable PERF_EVENTS, EVENT_PROFILE.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 26 Oct 2009 01:18:26 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Oct 30 08:19:56 2009	(r14510)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Oct 30 08:31:01 2009	(r14511)
@@ -2958,6 +2958,10 @@
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_PERF_EVENTS=y
+CONFIG_EVENT_PROFILE=y
+#. Compatibility setting
+# CONFIG_PERF_COUNTERS is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 ## choice: Choose SLAB allocator

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Oct 30 08:19:56 2009	(r14510)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Oct 30 08:31:01 2009	(r14511)
@@ -1325,11 +1325,6 @@
 CONFIG_EFI_PARTITION=y
 
 ##
-## file: init/Kconfig
-##
-CONFIG_PERF_COUNTERS=y
-
-##
 ## file: kernel/trace/Kconfig
 ##
 # CONFIG_MMIOTRACE is not set