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

[Maximilian Attems]

Author: maks
Date: Fri Oct 23 12:06:46 2009
New Revision: 14433

Log:
Revert "[x86_64] Set LOG_BUF_SHIFT to 2^18."

we don't currenlty use the full buffer, so needless for now.

This reverts commit 5b222597d932e4465fd451b26167ca96e460d574.

Conflicts:

	linux-2.6/debian/changelog

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Oct 23 03:52:44 2009	(r14432)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Oct 23 12:06:46 2009	(r14433)
@@ -15,7 +15,6 @@
   [ maximilian attems ]
   * [alpha] Disable SND_MIXART, causes gcc ICE.
   * [x86] Enable modular X86_MCE_INJECT.
-  * [x86_64] Set LOG_BUF_SHIFT to 2^18.
   * [x86_32] Set LSM_MMAP_MIN_ADDR to zero to unbreak dosemu and 16-bit Wine,
     ia64 and x86_64 to 65536 otherwise default to 32768.
   * Unset UEVENT_HELPER_PATH to save some boot cycles.

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Oct 23 03:52:44 2009	(r14432)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Oct 23 12:06:46 2009	(r14433)
@@ -48,7 +48,6 @@
 ## choice: RCU Implementation
 # CONFIG_CLASSIC_RCU is not set
 CONFIG_TREE_RCU=y
-CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_PREEMPT_RCU is not set
 ## end choice
 CONFIG_RCU_FANOUT=64