From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Feb 2010 18:15:31 +0000 (-0800)
Subject: Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.34-rc1~264
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/d25e8dbdab203ed8b4fd0a174bb5259e35ecd87c?hp=-c

Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  oprofile/x86: fix msr access to reserved counters
  oprofile/x86: use kzalloc() instead of kmalloc()
  oprofile/x86: fix perfctr nmi reservation for mulitplexing
  oprofile/x86: add comment to counter-in-use warning
  oprofile/x86: warn user if a counter is already active
  oprofile/x86: implement randomization for IBS periodic op counter
  oprofile/x86: implement lsfr pseudo-random number generator for IBS
  oprofile/x86: implement IBS cpuid feature detection
  oprofile/x86: remove node check in AMD IBS initialization
  oprofile/x86: remove OPROFILE_IBS config option
  oprofile: remove EXPERIMENTAL from the config option description
  oprofile: remove tracing build dependency
---

d25e8dbdab203ed8b4fd0a174bb5259e35ecd87c
diff --combined init/Kconfig
index d038a57004a2,b7c583956107..207ae29354a3
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -396,22 -396,6 +396,22 @@@ config RCU_FANOUT_EXAC
  
  	  Say N if unsure.
  
 +config RCU_FAST_NO_HZ
 +	bool "Accelerate last non-dyntick-idle CPU's grace periods"
 +	depends on TREE_RCU && NO_HZ && SMP
 +	default n
 +	help
 +	  This option causes RCU to attempt to accelerate grace periods
 +	  in order to allow the final CPU to enter dynticks-idle state
 +	  more quickly.  On the other hand, this option increases the
 +	  overhead of the dynticks-idle checking, particularly on systems
 +	  with large numbers of CPUs.
 +
 +	  Say Y if energy efficiency is critically important, particularly
 +	  	if you have relatively few CPUs.
 +
 +	  Say N if you are unsure.
 +
  config TREE_RCU_TRACE
  	def_bool RCU_TRACE && ( TREE_RCU || TREE_PREEMPT_RCU )
  	select DEBUG_FS
@@@ -1128,7 -1112,7 +1128,7 @@@ config MMAP_ALLOW_UNINITIALIZE
  	  See Documentation/nommu-mmap.txt for more information.
  
  config PROFILING
- 	bool "Profiling support (EXPERIMENTAL)"
+ 	bool "Profiling support"
  	help
  	  Say Y here to enable the extended profiling support mechanisms used
  	  by profilers such as OProfile.
@@@ -1278,8 -1262,4 +1278,8 @@@ source "block/Kconfig
  config PREEMPT_NOTIFIERS
  	bool
  
 +config PADATA
 +	depends on SMP
 +	bool
 +
  source "kernel/Kconfig.locks"