[kernel] r17488 - in dists/trunk/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Mon May 30 20:00:37 2011
New Revision: 17488

Log:
ipv4: Enable IP_FIB_TRIE_STATS

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 30 19:56:43 2011	(r17487)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 30 20:00:37 2011	(r17488)
@@ -14,6 +14,7 @@
   * cgroups: Enable CGROUP_MEM_RES_CTLR_SWAP but not
     CGROUP_MEM_RES_CTLR_SWAP_ENABLED. Swap accounting can be enabled
     using kernel parameter 'swapaccount'.
+  * ipv4: Enable IP_FIB_TRIE_STATS
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May 30 19:56:43 2011	(r17487)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 30 20:00:37 2011	(r17488)
@@ -3767,6 +3767,7 @@
 ##
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y