From 8b222dfb5a4b8f1293e8fabe8c9dd032b202c38e Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Fri, 23 Oct 2009 12:06:46 +0000 Subject: [PATCH] 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 svn path=/dists/trunk/linux-2.6/; revision=14433 --- debian/changelog | 1 - debian/config/kernelarch-x86/config-arch-64 | 1 - 2 files changed, 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1dcf33a4..fab10fac6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,6 @@ linux-2.6 (2.6.31-1~experimental.3) UNRELEASED; urgency=low [ 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. diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 8c503511d..2f6882d1e 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -48,7 +48,6 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m ## 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