Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

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

1 files changed, 94 insertions, 21 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 5a3ad5c20e2..38a2ecd47c3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -101,6 +101,66 @@ config LOCALVERSION_AUTO
 
           which is done within the script "scripts/setlocalversion".)
 
+config HAVE_KERNEL_GZIP
+        bool
+
+config HAVE_KERNEL_BZIP2
+        bool
+
+config HAVE_KERNEL_LZMA
+        bool
+
+choice
+        prompt "Kernel compression mode"
+        default KERNEL_GZIP
+        depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
+        help
+          The linux kernel is a kind of self-extracting executable.
+          Several compression algorithms are available, which differ
+          in efficiency, compression and decompression speed.
+          Compression speed is only relevant when building a kernel.
+          Decompression speed is relevant at each boot.
+
+          If you have any problems with bzip2 or lzma compressed
+          kernels, mail me (Alain Knaff) <alain@knaff.lu>. (An older
+          version of this functionality (bzip2 only), for 2.4, was
+          supplied by Christian Ludwig)
+
+          High compression options are mostly useful for users, who
+          are low on disk space (embedded systems), but for whom ram
+          size matters less.
+
+          If in doubt, select 'gzip'
+
+config KERNEL_GZIP
+        bool "Gzip"
+        depends on HAVE_KERNEL_GZIP
+        help
+          The old and tried gzip compression. Its compression ratio is
+          the poorest among the 3 choices; however its speed (both
+          compression and decompression) is the fastest.
+
+config KERNEL_BZIP2
+        bool "Bzip2"
+        depends on HAVE_KERNEL_BZIP2
+        help
+          Its compression ratio and speed is intermediate.
+          Decompression speed is slowest among the three.  The kernel
+          size is about 10% smaller with bzip2, in comparison to gzip.
+          Bzip2 uses a large amount of memory. For modern kernels you
+          will need at least 8MB RAM or more for booting.
+
+config KERNEL_LZMA
+        bool "LZMA"
+        depends on HAVE_KERNEL_LZMA
+        help
+          The most recent compression algorithm.
+          Its ratio is best, decompression speed is between the other
+          two. Compression is slowest.  The kernel size is about 33%
+          smaller with LZMA in comparison to gzip.
+
+endchoice
+
 config SWAP
         bool "Support for paging of anonymous memory (swap)"
         depends on MMU && BLOCK
@@ -471,7 +531,7 @@ config CGROUP_DEVICE
 
 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
@@ -505,7 +565,7 @@ config CGROUP_MEM_RES_CTLR
         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,
@@ -537,6 +597,8 @@ config CGROUP_MEM_RES_CTLR_SWAP
           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
 
@@ -627,7 +689,7 @@ config PID_NS
         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
@@ -675,6 +737,9 @@ config CC_OPTIMIZE_FOR_SIZE
 config SYSCTL
         bool
 
+config ANON_INODES
+        bool
+
 menuconfig EMBEDDED
         bool "Configure standard kernel features (for small systems)"
         help
@@ -780,18 +845,6 @@ config PCSPKR_PLATFORM
           This option allows to disable the internal PC-Speaker
           support, saving some memory.
 
-config COMPAT_BRK
-        bool "Disable heap randomization"
-        default y
-        help
-          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
-          /proc/sys/kernel/randomize_va_space to 2.
-
-          On non-ancient distros (post-2000 ones) N is usually a safe choice.
-
 config BASE_FULL
         default y
         bool "Enable full-sized data structures for core" if EMBEDDED
@@ -809,9 +862,6 @@ config FUTEX
           support for "fast userspace mutexes".  The resulting kernel may not
           run glibc-based applications correctly.
 
-config ANON_INODES
-        bool
-
 config EPOLL
         bool "Enable eventpoll support" if EMBEDDED
         default y
@@ -927,6 +977,18 @@ config SLUB_DEBUG
           SLUB sysfs support. /sys/slab will not exist and there will be
           no support for cache validation etc.
 
+config COMPAT_BRK
+        bool "Disable heap randomization"
+        default y
+        help
+          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 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.
+
 choice
         prompt "Choose SLAB allocator"
         default SLUB
@@ -975,13 +1037,25 @@ config TRACEPOINTS
 
 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 "Enable slow work thread pool"
+        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.
+
 endmenu         # General setup
 
 config HAVE_GENERIC_DMA_COHERENT
@@ -996,7 +1070,6 @@ config SLABINFO
 
 config RT_MUTEXES
         boolean
-        select PLIST
 
 config BASE_SMALL
         int
@@ -1081,7 +1154,7 @@ config INIT_ALL_POSSIBLE
           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