Merge branch 'core/urgent' into core/rcu

Merge reason: new patches to be queued up depend on:

   ef631b0: rcu: Make hierarchical RCU less IPI-happy

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --combined init/Kconfig
index 26ac8772464df92516805151c53f7d7687a731cb,7be4d3836745a049596e7be06b5e850c035b1f72..d4e9671347ee907ba9f59f5a87f0e446970b9725
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -208,6 -208,12 +208,12 @@@ config POSIX_MQUEU
  
          If unsure, say Y.
  
+ config POSIX_MQUEUE_SYSCTL
+       bool
+       depends on POSIX_MQUEUE
+       depends on SYSCTL
+       default y
+ 
  config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
        help
@@@ -302,7 -308,7 +308,7 @@@ menu "RCU Subsystem
  
  choice
        prompt "RCU Implementation"
 -      default CLASSIC_RCU
 +      default TREE_RCU
  
  config CLASSIC_RCU
        bool "Classic RCU"
@@@ -531,7 -537,7 +537,7 @@@ config CGROUP_DEVIC
  
  config CPUSETS
        bool "Cpuset support"
-       depends on SMP && CGROUPS
+       depends on CGROUPS
        help
          This option will let you create and manage CPUSETs which
          allow dynamically partitioning a system into sets of CPUs and
@@@ -565,7 -571,7 +571,7 @@@ config CGROUP_MEM_RES_CTL
        select MM_OWNER
        help
          Provides a memory resource controller that manages both anonymous
-         memory and page cache. (See Documentation/controllers/memory.txt)
+         memory and page cache. (See Documentation/cgroups/memory.txt)
  
          Note that setting this option increases fixed memory overhead
          associated with each page of memory in the system. By this,
@@@ -597,6 -603,8 +603,8 @@@ config CGROUP_MEM_RES_CTLR_SWA
          is disabled by boot option, this will be automatically disabled and
          there will be no overhead from this. Even when you set this config=y,
          if boot option "noswapaccount" is set, swap will not be accounted.
+         Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
+         size is 4096bytes, 512k per 1Gbytes of swap.
  
  endif # CGROUPS
  
@@@ -668,10 -676,10 +676,10 @@@ config UTS_N
  
  config IPC_NS
        bool "IPC namespace"
-       depends on NAMESPACES && SYSVIPC
+       depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE)
        help
          In this namespace tasks work with IPC ids which correspond to
-         different IPC objects in different namespaces
+         different IPC objects in different namespaces.
  
  config USER_NS
        bool "User namespace (EXPERIMENTAL)"
@@@ -687,7 -695,7 +695,7 @@@ config PID_N
        depends on NAMESPACES && EXPERIMENTAL
        help
          Support process id namespaces.  This allows having multiple
-         process with the same pid as long as they are in different
+         processes with the same pid as long as they are in different
          pid namespaces.  This is a building block of containers.
  
          Unless you want to work with an experimental feature
@@@ -800,6 -808,14 +808,14 @@@ config KALLSYMS_EXTRA_PAS
           you wait for kallsyms to be fixed.
  
  
+ config STRIP_ASM_SYMS
+       bool "Strip assembler-generated symbols during link"
+       default n
+       help
+         Strip internal assembler-generated symbols during a link (symbols
+         that look like '.Lxxx') so they don't pollute the output of
+         get_wchan() and suchlike.
+ 
  config HOTPLUG
        bool "Support for hot-pluggable devices" if EMBEDDED
        default y
@@@ -952,7 -968,7 +968,7 @@@ config COMPAT_BR
          Randomizing heap placement makes heap exploits harder, but it
          also breaks ancient binaries (including anything libc5 based).
          This option changes the bootup default to heap randomization
-         disabled, and can be overriden runtime by setting
+         disabled, and can be overridden at runtime by setting
          /proc/sys/kernel/randomize_va_space to 2.
  
          On non-ancient distros (post-2000 ones) N is usually a safe choice.
@@@ -1005,13 -1021,27 +1021,27 @@@ config TRACEPOINT
  
  config MARKERS
        bool "Activate markers"
-       depends on TRACEPOINTS
+       select TRACEPOINTS
        help
          Place an empty function call at each marker site. Can be
          dynamically changed for a probe function.
  
  source "arch/Kconfig"
  
+ config SLOW_WORK
+       default n
+       bool
+       help
+         The slow work thread pool provides a number of dynamically allocated
+         threads that can be used by the kernel to perform operations that
+         take a relatively long time.
+ 
+         An example of this would be CacheFiles doing a path lookup followed
+         by a series of mkdirs and a create call, all of which have to touch
+         disk.
+ 
+         See Documentation/slow-work.txt.
+ 
  endmenu               # General setup
  
  config HAVE_GENERIC_DMA_COHERENT
@@@ -1110,7 -1140,7 +1140,7 @@@ config INIT_ALL_POSSIBL
          cpu_possible_map, some of them chose to initialize cpu_possible_map
          with all 1s, and others with all 0s.  When they were centralised,
          it was better to provide this option than to break all the archs
-         and have several arch maintainers persuing me down dark alleys.
+         and have several arch maintainers pursuing me down dark alleys.
  
  config STOP_MACHINE
        bool