kernel/init, branch linux-2.6.37.y

fix jiffy calculations in calibrate_delay_direct to handle overflow

2011-02-17T23:14:34Z

commit 70a062286b9dfcbd24d2e11601aecfead5cf709a upstream. Fixes a hang when booting as dom0 under Xen, when jiffies can be quite large by the time the kernel init gets this far. Signed-off-by: Tim Deegan [jbeulich@novell.com: !time_after() -> time_before_eq() as suggested by Jiri Slaby] Signed-off-by: Jan Beulich Cc: Jiri Slaby Cc: Jeremy Fitzhardinge Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman

name_to_dev_t() must not call __init code

2011-01-03T19:48:11Z

The function can't be __init itself (being called from some sysfs handler), and hence none of the functions it calls can be either. Signed-off-by: Jan Beulich Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds

cgroups: make swap accounting default behavior configurable

2010-11-24T21:50:45Z

Swap accounting can be configured by CONFIG_CGROUP_MEM_RES_CTLR_SWAP configuration option and then it is turned on by default. There is a boot option (noswapaccount) which can disable this feature. This makes it hard for distributors to enable the configuration option as this feature leads to a bigger memory consumption and this is a no-go for general purpose distribution kernel. On the other hand swap accounting may be very usuful for some workloads. This patch adds a new configuration option which controls the default behavior (CGROUP_MEM_RES_CTLR_SWAP_ENABLED). If the option is selected then the feature is turned on by default. It also adds a new boot parameter swapaccount[=1|0] which enhances the original noswapaccount parameter semantic by means of enable/disable logic (defaults to 1 if no value is provided to be still consistent with noswapaccount). The default behavior is unchanged (if CONFIG_CGROUP_MEM_RES_CTLR_SWAP is enabled then CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is enabled as well) Signed-off-by: Michal Hocko Acked-by: Daisuke Nishimura Cc: Balbir Singh Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

BKL: remove extraneous #include

2010-11-17T16:59:32Z

The big kernel lock has been removed from all these files at some point, leaving only the #include. Remove this too as a cleanup. Signed-off-by: Arnd Bergmann Signed-off-by: Linus Torvalds

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2010-10-28T22:13:55Z

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: initramfs: Fix build break on symbol-prefixed archs initramfs: fix initramfs size calculation initramfs: generalize initramfs_data.xxx.S variants scripts/kallsyms: Enable error messages while hush up unnecessary warnings scripts/setlocalversion: update comment kbuild: Use a single clean rule for kernel and external modules kbuild: Do not run make clean in $(srctree) scripts/mod/modpost.c: fix commentary accordingly to last changes kbuild: Really don't clean bounds.h and asm-offsets.h

namespaces Kconfig: move namespace menu location after the cgroup

2010-10-28T01:03:17Z

We have the namespaces as a menuconfig like the cgroup. The cgroup and the namespace are two base bricks for the containers. It is more logical to put the namespace menu right after the cgroup menu. Signed-off-by: Daniel Lezcano Cc: Li Zefan Cc: "Serge E. Hallyn" Cc: "Eric W. Biederman" Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

namespaces Kconfig: remove the cgroup device whitelist experimental tag

2010-10-28T01:03:17Z

This subsystem is merged since a long time now, I think we can consider it mature enough. Signed-off-by: Daniel Lezcano Cc: Li Zefan Cc: "Serge E. Hallyn" Cc: "Eric W. Biederman" Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

namespaces Kconfig: remove pointless cgroup dependency

2010-10-28T01:03:16Z

The different cgroup subsystems are under the cgroup submenu. The dependency between the cgroups and the menu subsystems is pointless. Signed-off-by: Daniel Lezcano Acked-by: Li Zefan Cc: "Serge E. Hallyn" Cc: "Eric W. Biederman" Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

namespaces Kconfig: make namespace a submenu

2010-10-28T01:03:16Z

Make the namespaces config option a submenu. Signed-off-by: Daniel Lezcano Cc: Li Zefan Cc: "Serge E. Hallyn" Cc: "Eric W. Biederman" Cc: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

namespaces: default all the namespaces to 'yes' when CONFIG_NAMESPACES is selected

2010-10-28T01:03:16Z

As the different namespaces depend on 'CONFIG_NAMESPACES', it is logical to enable all the namespaces when we enable NAMESPACES. Signed-off-by: Daniel Lezcano Cc: "Eric W. Biederman" Cc: David Miller Acked-By: Matt Helsley Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds