Johannes Weiner
3dae7fec5e
mm: memcontrol: remove hierarchy restrictions for swappiness and oom_control ...
Per-memcg swappiness and oom killing can currently not be tweaked on a
memcg that is part of a hierarchy, but not the root of that hierarchy.
Users have complained that they can't configure this when they turned on
hierarchy mode. In fact, with hierarchy mode becoming the default, this
restriction disables the tunables entirely.
But there is no good reason for this restriction. The settings for
swappiness and OOM killing are taken from whatever memcg whose limit
triggered reclaim and OOM invocation, regardless of its position in the
hierarchy tree.
Allow setting swappiness on any group. The knob on the root memcg
already reads the global VM swappiness, make it writable as well.
Allow disabling the OOM killer on any non-root memcg.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Tejun Heo <tj@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-06-04 16:53:58 -07:00
ACPI and power management updates for 3.16-rc1
2014-06-04 08:57:16 -07:00
Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
2013-07-03 16:08:06 -07:00
Documentation / ACPI: Fix location of GPIO documentation
2014-05-23 14:39:26 +02:00
aoe: remove do-nothing NAME="%k" term from example udev rules
2013-09-11 15:59:28 -07:00
Despite relatively young Berlin SoC support, we already have support
2014-05-26 13:41:02 -07:00
- Documentation clarification on CPU topology and booting requirements
2014-04-08 12:06:03 -07:00
backlight: lp855x_bl: support new LP8555 device
2013-11-13 12:09:14 +09:00
Documentation/: update 00-INDEX files
2014-02-10 16:01:40 -08:00
Documentation/: update 00-INDEX files
2014-02-10 16:01:40 -08:00
zram: propagate error to user
2014-04-07 16:36:02 -07:00
mm: memcontrol: remove hierarchy restrictions for swappiness and oom_control
2014-06-04 16:53:58 -07:00
w1: optional bundling of netlink kernel replies
2014-05-27 13:56:21 -07:00
TTY:console: update document console.txt
2013-05-21 10:21:57 -07:00
PM / OPP: Move cpufreq specific OPP functions out of generic OPP library
2014-05-07 00:39:03 +02:00
cpuidle: remove cpuidle_unregister_governor()
2013-10-30 01:21:24 +01:00
drivers/dma: remove unused support for MEMSET operations
2013-07-03 16:07:42 -07:00
Documentation: development-process: Update -mm and -next URLs
2013-07-25 12:37:24 +02:00
dm thin: add 'no_space_timeout' dm-thin-pool module param
2014-05-20 14:30:36 -04:00
DeviceTree for 3.16:
2014-06-04 10:02:38 -07:00
USB driver patches for 3.16-rc1
2014-06-03 09:11:20 -07:00
Staging driver patches for 3.16-rc1
2014-06-03 08:34:00 -07:00
Linux 3.14-rc5
2014-03-11 06:55:49 -03:00
Documentation: remove reference to 2.7 kernel in early-userspace
2013-08-20 12:47:28 +02:00
extcon: fix switch class porting guide (Documentation)
2014-01-07 11:54:28 +09:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
FMC: make eeprom attribute writable
2014-02-28 15:12:08 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
New driver for NCT6683D
2014-06-03 11:09:43 -07:00
Documentation: i2c: improve section about flags mangling the protocol
2014-04-06 13:53:48 +02:00
Documentation/: update 00-INDEX files
2014-02-10 16:01:40 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
s390/hypfs: add interface for diagnose 0x304
2014-01-24 09:40:59 +01:00
Documentation: Update stable address in Chinese and Japanese translations
2014-04-16 14:13:27 -07:00
kconfig: make allnoconfig disable options behind EMBEDDED and EXPERT
2014-04-07 16:36:09 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
Documentation: HOWTO: Updates on subsystem trees, patchwork, -next (vs. -mm) in ko_KR
2014-01-08 15:32:51 -08:00
Documentation/: update 00-INDEX files
2014-02-10 16:01:40 -08:00
Documentation/: update 00-INDEX files
2014-02-10 16:01:40 -08:00
Documentation/: update 00-INDEX files
2014-02-10 16:01:40 -08:00
doc: fix misspellings with 'codespell' tool
2013-05-28 12:02:12 +02:00
misc: mic: Fix endianness issues.
2013-11-27 11:03:38 -08:00
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2014-01-29 18:56:27 -08:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
parisc: document the shadow registers
2013-07-09 22:09:19 +02:00
Merge branch 'pci/dead-code' into next
2014-02-20 14:32:34 -07:00
phy: Add new Exynos USB 2.0 PHY driver
2014-03-08 12:39:44 +05:30
Merge branch 'pm-cpufreq'
2014-06-03 23:13:20 +02:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
USB: serial: invoke dcd_change ldisc's handler.
2013-09-26 09:45:40 -07:00
ptp: Fix compiler warnings in the testptp utility
2014-03-27 14:51:47 -04:00
rapidio: rework device hierarchy and introduce mport class of devices
2014-04-07 16:36:07 -07:00
documentation: Update API documentation
2014-04-29 08:38:53 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
asm/system.h: clean asm/system.h from docs
2014-04-07 16:36:11 -07:00
[SCSI] megaraid_sas: Version and Changelog update
2014-03-15 10:19:21 -07:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
tty/serial: Add GPIOLIB helpers for controlling modem lines
2014-05-28 12:49:14 -07:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/sh-hspi', 'spi/topic/sh-msiof', 'spi/topic/sh-sci', 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next
2014-03-30 00:51:34 +00:00
hung_task: check the value of "sysctl_hung_task_timeout_sec"
2014-04-07 16:36:07 -07:00
target: Remove TF_CIT_TMPL macro
2013-10-16 13:35:02 -07:00
thermal: thermal_core: allow binding with limits on bind_params
2013-09-03 09:10:24 -04:00
Documentation/: update 00-INDEX files
2014-02-10 16:01:40 -08:00
drivers/tpm: add xen tpmfront interface
2013-08-09 10:57:06 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
[media] s5p-fimc: Remove reference to outdated macro
2014-03-14 10:37:43 -03:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
w1: optional bundling of netlink kernel replies
2014-05-27 13:56:21 -07:00
watchdog: it87_wdt: Work around non-working CIR interrupts
2014-03-31 13:33:55 +02:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
xtensa: remap io area defined in device tree
2014-01-15 00:25:14 +04:00
driver core fixes for 3.15-rc2
2014-04-18 16:59:52 -07:00
Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-02 13:15:58 -07:00
KEYS: Fix multiple key add into associative array
2013-12-02 11:24:18 +00:00
arch,doc: Convert smp_mb__*()
2014-04-18 14:20:48 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-07-04 11:40:58 -07:00
Documentation: fix typo and update version in cachetlb.txt
2013-08-20 12:46:52 +02:00
doc: Note need of bc in the kernel build from 3.10 onwards
2014-05-19 16:27:20 +02:00
documentation: Update circular buffer for load-acquire/store-release
2013-12-03 10:08:57 -08:00
Documentation: clk: Add locking documentation
2014-03-19 14:56:06 -07:00
Coccinelle: Update information about the minimal version required
2013-07-03 22:58:20 +02:00
Documentation/CodingStyle: allow multiple return statements per function
2013-07-03 16:08:01 -07:00
Doc/cpu-hotplug: Specify race-free way to register CPU hotplug callbacks
2014-03-20 13:43:40 +01:00
doc: Documentation/cputopology.txt fix typo
2013-09-04 12:59:47 +02:00
firewire: revert to 4 GB RDMA, fix protocols using Memory Space
2014-05-29 15:50:30 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-04-04 09:50:07 -07:00
DMA-API: Update dma_pool_create ()and dma_pool_alloc() descriptions
2014-05-26 17:28:28 -06:00
DMA-API: Capitalize "CPU" consistently
2014-05-26 17:28:27 -06:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
DMA-API: Clarify physical/bus address distinction
2014-05-20 16:54:21 -06:00
dmatest: add a 'wait' parameter
2013-11-14 11:04:40 -08:00
Documentation: LLVMLinux: Update Documentation/dontdiff
2014-04-09 13:44:34 -07:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
2014-06-04 08:50:34 -07:00
doc: Fix trivial spelling mistake in efi-stub.txt
2013-12-19 15:09:14 +01:00
Documentation: update thunderbird email client settings
2014-05-25 12:39:00 -07:00
doc: fix double words
2014-03-21 13:16:58 +01:00
gcov: compile specific gcov implementation based on gcc version
2013-11-13 12:09:34 +09:00
Documentation: HOWTO: Update broken links to tpp
2013-12-10 23:09:08 -08:00
Documentation: HSI: Add some general description for the HSI subsystem
2014-05-04 09:49:46 +02:00
doc: documentation/hwspinlock.txt fix typo
2013-08-27 10:46:02 +02:00
doc: fix some typos
2013-12-02 14:48:28 +01:00
doc: fix a typo about irq affinity
2013-08-20 12:59:18 +02:00
doc: fix some typos
2013-12-02 14:48:28 +01:00
asm/system.h: clean asm/system.h from docs
2014-04-07 16:36:11 -07:00
Documentation: update java sample wrapper for java 7
2014-05-25 12:39:00 -07:00
kernel-doc: Update references to SGML to refs to XML instead.
2013-05-28 12:02:11 +02:00
cma: add placement specifier for "cma=" kernel parameter
2014-06-04 16:53:57 -07:00
Documentation/kernel-per-CPU-kthreads.txt: Workqueue affinity
2014-02-17 14:56:08 -08:00
doc: fix double words
2014-03-21 13:16:58 +01:00
Documentation/kmemleak.txt: updates
2014-04-03 16:21:27 -07:00
kobject: remove kset from sysfs immediately in kset_unregister()
2013-12-07 21:20:11 -08:00
lockstat: Report avg wait and hold times
2013-10-09 08:19:08 +02:00
Documentation/serial: Delete obsolete driver documentation
2014-04-16 14:20:34 -07:00
doc: fix some typos in documentations
2013-12-02 14:45:19 +01:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2013-07-13 12:09:57 -07:00
arch,doc: Convert smp_mb__*()
2014-04-18 14:20:48 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
Nothing major: the stricter permissions checking for sysfs broke
2014-04-06 09:38:07 -07:00
locking/doc: Update references to kernel/mutex.c
2013-11-11 12:41:33 +01:00
Use 'E' instead of 'X' for unsigned module taint flag.
2014-03-31 14:52:43 +10:30
drivers: phy: Add support for optional phys
2014-02-05 05:48:43 +00:00
pinctrl: Fix some typos and grammar issues in the documentation
2014-01-15 13:59:50 +01:00
doc: printk-formats: do not mention casts for u64/s64
2014-05-05 15:32:42 +02:00
Documentation/pwm: Fix trivial typos
2013-10-24 10:51:33 +02:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
Documentation/robust-futex-API: Count properly to 4
2013-11-30 14:08:28 +01:00
doc: spelling error changes
2014-05-05 15:32:05 +02:00
doc: fix some typos in documentations
2013-12-02 14:45:19 +01:00
rtc: add ability to push out an existing wakealarm using sysfs
2013-07-03 16:07:54 -07:00
sched: Rename sched.c as sched/core.c in comments and Documentation
2013-06-19 12:58:42 +02:00
stable_kernel_rules: spelling/word usage
2014-04-16 14:13:26 -07:00
doc: fix some typos in documentations
2013-12-02 14:45:19 +01:00
Finally eradicate CONFIG_HOTPLUG
2013-06-03 14:20:18 -07:00
Documentation/SubmittingPatches: update some dead URLs
2014-04-03 16:21:27 -07:00
doc: Fix typo in doucmentations
2013-07-25 12:34:15 +02:00
sysrq: Allow magic SysRq key functions to be disabled through Kconfig
2013-10-16 13:01:44 -07:00
ether_addr_equal: Optimize implementation, remove unused compare_ether_addr
2013-12-06 16:37:43 -05:00
vfio: fix documentation
2013-09-05 16:36:21 -06:00
VME: Rename vme_slot_get to avoid confusion with reference counting
2013-12-03 11:15:58 -08:00
workqueue: Correct/Drop references to gcwq in Documentation
2013-08-21 10:32:09 -04:00
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
zorro/UAPI: Disintegrate include/linux/zorro*.h
2013-11-26 11:09:08 +01:00
3dae7fec5e
