Johannes Weiner
185efc0f9a
memcg: Revert "memcg: add memory.vmscan_stat"
...
Revert the post-3.0 commit 82f9d486e5 ("memcg: add
memory.vmscan_stat").
The implementation of per-memcg reclaim statistics violates how memcg
hierarchies usually behave: hierarchically.
The reclaim statistics are accounted to child memcgs and the parent
hitting the limit, but not to hierarchy levels in between. Usually,
hierarchical statistics are perfectly recursive, with each level
representing the sum of itself and all its children.
Since this exports statistics to userspace, this may lead to confusion
and problems with changing things after the release, so revert it now,
we can try again later.
Signed-off-by: Johannes Weiner <jweiner@redhat.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Ying Han <yinghan@google.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-14 18:09:38 -07:00
..
ABI
[SCSI] isci: Adding documentation to API change and fixup sysfs registration
2011-08-23 19:54:24 -07:00
accounting
Documentation: update cgroupfs mount point
2011-06-15 21:52:50 -07:00
acpi
ACPI, APEI, EINJ Param support is disabled by default
2011-08-03 11:15:59 -04:00
aoe
arm
Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
2011-07-25 12:43:28 -07:00
auxdisplay
blackfin
Blackfin: spi-docs: further clarify GPIO CS behavior with various modes
2011-07-23 01:18:35 -04:00
block
cfq-iosched: Add documentation about idling
2011-08-05 09:42:20 +02:00
blockdev
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
cdrom
cgroups
memcg: Revert "memcg: add memory.vmscan_stat"
2011-09-14 18:09:38 -07:00
connector
console
cpu-freq
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
cpuidle
cris
crypto
development-process
sched: Generalize sleep inside spinlock detection
2011-06-23 00:44:38 +02:00
device-mapper
dm crypt: optionally support discard requests
2011-08-02 12:32:08 +01:00
devicetree
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-08-03 22:00:09 -10:00
DocBook
[media] v4l2: Fix documentation of the codec device controls
2011-09-11 09:33:38 -03:00
driver-model
DOCUMENTATION: Replace create_device() with device_create().
2011-06-07 10:04:22 -07:00
dvb
[media] em28xx: Change firmware name for Terratec H5 DRX-K
2011-07-27 17:55:51 -03:00
early-userspace
fault-injection
fault-injection: add ability to export fault_attr in arbitrary directory
2011-08-03 14:25:20 -10:00
fb
DRM: clean up and document parsing of video= parameter
2011-07-25 12:02:26 +01:00
filesystems
Documentation: befs.txt: no maintainer, orphaned
2011-08-13 18:34:03 -07:00
firmware_class
frv
Documentation: add pointer to name_to_dev_t for root= values
2011-08-03 14:25:21 -10:00
hid
HID: Move hiddev.txt to the new Documentation/hid directory
2011-03-22 11:43:51 +01:00
hwmon
hwmon: (max16065) Add chip access warning to documentation
2011-09-06 08:56:06 -07:00
i2c
i2c-i801: SMBus patch for Intel Panther Point DeviceIDs
2011-05-24 20:58:49 +02:00
i2o
doc: i2o: fix typo 'Settting'
2011-06-07 16:06:01 +02:00
ia64
Fix common misspellings
2011-03-31 11:26:23 -03:00
ide
infiniband
input
Input: elantech - describe further the protocol
2011-05-16 22:48:24 -07:00
ioctl
ioctl: register LTTng ioctl
2011-09-12 11:50:56 -07:00
isdn
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
ja_JP
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-07-25 23:06:24 -07:00
kbuild
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
kdump
ko_KR
laptops
thinkpad-acpi: handle HKEY 0x4010, 0x4011 events
2011-07-07 10:39:05 -04:00
leds
Documentation: consolidate leds files to leds/ subdir
2011-04-04 17:51:47 -07:00
m68k
Documentation: add pointer to name_to_dev_t for root= values
2011-08-03 14:25:21 -10:00
make
mips
Fix common misspellings
2011-03-31 11:26:23 -03:00
misc-devices
Fix common misspellings
2011-03-31 11:26:23 -03:00
mmc
mmc: documentation of mmc non-blocking request usage and design.
2011-07-21 10:34:52 -04:00
mn10300
mtd
namespaces
netlabel
networking
net: Documentation: RFC 2553bis is now RFC 3493
2011-08-22 11:28:57 -07:00
nfc
parisc
PCI
Docs: MSI-HOWTO: MSI -> MSIs
2011-08-02 21:34:41 +00:00
pcmcia
power
PM / Runtime: Correct documentation of pm_runtime_irq_safe()
2011-08-25 15:31:05 +02:00
powerpc
Fix common misspellings
2011-03-31 11:26:23 -03:00
pps
prctl
pti
Kernel documentation for the PTI feature.
2011-05-13 16:31:00 -07:00
ptp
ptp: Added a brand new class driver for ptp clocks.
2011-05-23 13:01:00 -07:00
rapidio
rapidio: add RapidIO documentation
2011-03-23 19:46:41 -07:00
RCU
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
s390
[S390] remove tape block docu
2011-07-24 10:48:22 +02:00
scheduler
Merge branch 'master' into for-next
2011-07-11 14:15:55 +02:00
scsi
[SCSI] megaraid_sas Version to 5.40-rc1 and Changelog update
2011-07-27 15:45:22 +04:00
security
encrypted-keys: move ecryptfs documentation to proper location
2011-06-30 19:08:14 +10:00
serial
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
sh
sound
ALSA: hda - Add documentation for codec-specific mixer controls
2011-07-19 09:34:10 +02:00
sparc
spi
spi/pxa2xx: Remove unavailable ssp_type from documentation
2011-06-18 22:36:30 -06:00
sysctl
ipc: introduce shm_rmid_forced sysctl
2011-07-26 16:49:44 -07:00
target
[SCSI] tcm_mod_builder.py: Fix generated *_drop_nodeacl() handler
2011-03-23 11:36:45 -05:00
telephony
Fix common misspellings
2011-03-31 11:26:23 -03:00
thermal
timers
doc: timers-howto: fix a typo ("unsgined")
2011-05-17 10:52:02 +02:00
trace
tracing/kprobes: Support module init function probing
2011-07-15 15:17:14 -04:00
usb
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-07-25 23:08:32 -07:00
vDSO
Document the vDSO and add a reference parser
2011-07-14 17:57:09 -07:00
video4linux
[media] v4l2-framework.txt: update v4l2_event section
2011-07-27 17:53:33 -03:00
virtual
lguest: allow booting guest with CONFIG_RELOCATABLE=y
2011-08-15 10:15:10 +09:30
vm
Documentation: update cgroupfs mount point
2011-06-15 21:52:50 -07:00
w1
Fix common misspellings
2011-03-31 11:26:23 -03:00
watchdog
watchdog: WatchDog Timer Driver Core - Add minimum and max timeout
2011-07-28 08:01:18 +00:00
wimax
x86
Merge commit 'v3.0' into x86/vdso
2011-08-04 16:13:20 -07:00
zh_CN
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-07-25 23:06:24 -07:00
.gitignore
00-INDEX
Documentation: add Ramoops usage description
2011-08-13 18:34:03 -07:00
applying-patches.txt
atomic_ops.txt
Documentation/atomic_ops.txt: avoid volatile in sample code
2011-05-26 17:12:34 -07:00
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
mm: convert mm->cpu_vm_cpumask into cpumask_var_t
2011-05-25 08:39:21 -07:00
Changes
Documentation/Changes: remove some really obsolete text
2011-07-11 16:48:38 -07:00
circular-buffers.txt
coccinelle.txt
CodingStyle
CodingStyle: Document the exception of not splitting user-visible strings, for grepping
2011-08-06 11:59:07 -07:00
cpu-hotplug.txt
Fix common misspellings
2011-03-31 11:26:23 -03:00
cpu-load.txt
cputopology.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
Fix common misspellings
2011-03-31 11:26:23 -03:00
devices.txt
DMA-API-HOWTO.txt
Documentation/DMA-API-HOWTO.txt: fix misleading example
2011-07-26 16:49:45 -07:00
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
dmaengine.txt
Improve slave/cyclic DMA engine documentation
2011-07-27 20:33:48 +05:30
dontdiff
Documentation: update dontdiff file
2011-05-23 15:14:11 -07:00
dynamic-debug-howto.txt
Merge branch 'docs-next' of git://git.lwn.net/linux-2.6
2011-03-27 19:46:59 -07:00
edac.txt
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
eisa.txt
Fix common misspellings
2011-03-31 11:26:23 -03:00
email-clients.txt
Documentation: email-clients: Add better Thunderbird information
2011-08-13 18:34:03 -07:00
feature-removal-schedule.txt
xfs: deprecate the nodelaylog mount option
2011-08-25 10:30:05 -05:00
flexible-arrays.txt
flex_array: flex_array_prealloc takes a number of elements, not an end
2011-04-28 16:12:47 -04:00
futex-requeue-pi.txt
gcov.txt
gpio.txt
highuid.txt
HOWTO
Documentation: update LXR web link
2011-05-23 15:14:11 -07:00
hw_random.txt
hwspinlock.txt
init.txt
initrd.txt
Intel-IOMMU.txt
intel_txt.txt
io-mapping.txt
io_ordering.txt
iostats.txt
Documentation/iostats.txt: bit-size reference etc.
2011-03-23 20:44:18 +01:00
IPMI.txt
IRQ-affinity.txt
bitmap, irq: add smp_affinity_list interface to /proc/irq
2011-05-25 08:39:45 -07:00
IRQ.txt
irqflags-tracing.txt
Fix common misspellings
2011-03-31 11:26:23 -03:00
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt
kernel-docs.txt
Documentation: drop Linux Source Driver from kernel-docs references
2011-08-13 18:34:02 -07:00
kernel-parameters.txt
Merge branches 'apei', 'bz-13195' and 'doc' into acpi
2011-09-12 20:00:00 -04:00
kmemcheck.txt
kmemleak.txt
Documentation: update kmemleak supported archs
2011-06-15 21:52:50 -07:00
kobject.txt
kprobes.txt
kref.txt
ldm.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
Documentation: Add statistics about nested locks
2011-05-28 17:03:29 +02:00
logo.gif
logo.txt
magic-number.txt
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
Makefile
ManagementStyle
mca.txt
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
md.txt
md: update documentation for md/rdev/state sysfs interface
2011-07-28 11:31:48 +10:00
media-framework.txt
[media] v4l: Fix minor typos in the documentation
2011-07-27 17:53:10 -03:00
memory-barriers.txt
memory-hotplug.txt
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
Documentation: update printk-formats.txt
2011-06-15 21:52:50 -07:00
prio_tree.txt
ramoops.txt
Documentation: add Ramoops usage description
2011-08-13 18:34:03 -07:00
rbtree.txt
Documentation: Update augmented rbtree documentation
2011-07-24 10:03:05 -07:00
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
Fix common misspellings
2011-03-31 11:26:23 -03:00
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
sparse.txt
spinlocks.txt
Documentation/spinlocks.txt: Remove reference to sti()/cli()
2011-07-11 12:45:04 -07:00
stable_api_nonsense.txt
doc: stable_api_nonsense.txt: fix paragraph to make more sense.
2011-03-30 12:02:05 +02:00
stable_kernel_rules.txt
SubmitChecklist
Documentation/SubmitChecklist: add RCU debug config options
2011-07-25 20:57:17 -07:00
SubmittingDrivers
Documentation: SubmittingDrivers: fix Linus's git tree URL
2011-08-13 18:34:03 -07:00
SubmittingPatches
Documentation: fix spelling error in SubmittingPatches
2011-08-13 18:34:02 -07:00
svga.txt
sysfs-rules.txt
sysrq.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt
Documentation: fix vgaarbiter.txt typos etc.
2011-05-23 15:14:11 -07:00
video-output.txt
volatile-considered-harmful.txt
workqueue.txt
workqueue: Document debugging tricks
2011-03-31 13:40:42 +02:00
xz.txt
zorro.txt