Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8efc59ad authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'sirf/cleanup' into next/cleanup

parents 6f6184a9 492c4a0d
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
What:		/sys/class/scsi_host/hostX/isci_id
Date:		June 2011
Contact:	Dave Jiang <dave.jiang@intel.com>
Description:
		This file contains the enumerated host ID for the Intel
		SCU controller. The Intel(R) C600 Series Chipset SATA/SAS
		Storage Control Unit embeds up to two 4-port controllers in
		a single PCI device.  The controllers are enumerated in order
		which usually means the lowest number scsi_host corresponds
		with the first controller, but this association is not
		guaranteed.  The 'isci_id' attribute unambiguously identifies
		the controller index: '0' for the first controller,
		'1' for the second.
+1 −84
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ will be charged as a new owner of it.

5.2 stat file

5.2.1 memory.stat file includes following statistics
memory.stat file includes following statistics

# per-memory cgroup local status
cache		- # of bytes of page cache memory.
@@ -438,89 +438,6 @@ Note:
	 file_mapped is accounted only when the memory cgroup is owner of page
	 cache.)

5.2.2 memory.vmscan_stat

memory.vmscan_stat includes statistics information for memory scanning and
freeing, reclaiming. The statistics shows memory scanning information since
memory cgroup creation and can be reset to 0 by writing 0 as

 #echo 0 > ../memory.vmscan_stat

This file contains following statistics.

[param]_[file_or_anon]_pages_by_[reason]_[under_heararchy]
[param]_elapsed_ns_by_[reason]_[under_hierarchy]

For example,

  scanned_file_pages_by_limit indicates the number of scanned
  file pages at vmscan.

Now, 3 parameters are supported

  scanned - the number of pages scanned by vmscan
  rotated - the number of pages activated at vmscan
  freed   - the number of pages freed by vmscan

If "rotated" is high against scanned/freed, the memcg seems busy.

Now, 2 reason are supported

  limit - the memory cgroup's limit
  system - global memory pressure + softlimit
           (global memory pressure not under softlimit is not handled now)

When under_hierarchy is added in the tail, the number indicates the
total memcg scan of its children and itself.

elapsed_ns is a elapsed time in nanosecond. This may include sleep time
and not indicates CPU usage. So, please take this as just showing
latency.

Here is an example.

# cat /cgroup/memory/A/memory.vmscan_stat
scanned_pages_by_limit 9471864
scanned_anon_pages_by_limit 6640629
scanned_file_pages_by_limit 2831235
rotated_pages_by_limit 4243974
rotated_anon_pages_by_limit 3971968
rotated_file_pages_by_limit 272006
freed_pages_by_limit 2318492
freed_anon_pages_by_limit 962052
freed_file_pages_by_limit 1356440
elapsed_ns_by_limit 351386416101
scanned_pages_by_system 0
scanned_anon_pages_by_system 0
scanned_file_pages_by_system 0
rotated_pages_by_system 0
rotated_anon_pages_by_system 0
rotated_file_pages_by_system 0
freed_pages_by_system 0
freed_anon_pages_by_system 0
freed_file_pages_by_system 0
elapsed_ns_by_system 0
scanned_pages_by_limit_under_hierarchy 9471864
scanned_anon_pages_by_limit_under_hierarchy 6640629
scanned_file_pages_by_limit_under_hierarchy 2831235
rotated_pages_by_limit_under_hierarchy 4243974
rotated_anon_pages_by_limit_under_hierarchy 3971968
rotated_file_pages_by_limit_under_hierarchy 272006
freed_pages_by_limit_under_hierarchy 2318492
freed_anon_pages_by_limit_under_hierarchy 962052
freed_file_pages_by_limit_under_hierarchy 1356440
elapsed_ns_by_limit_under_hierarchy 351386416101
scanned_pages_by_system_under_hierarchy 0
scanned_anon_pages_by_system_under_hierarchy 0
scanned_file_pages_by_system_under_hierarchy 0
rotated_pages_by_system_under_hierarchy 0
rotated_anon_pages_by_system_under_hierarchy 0
rotated_file_pages_by_system_under_hierarchy 0
freed_pages_by_system_under_hierarchy 0
freed_anon_pages_by_system_under_hierarchy 0
freed_file_pages_by_system_under_hierarchy 0
elapsed_ns_by_system_under_hierarchy 0

5.3 swappiness

Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.
+6 −3
Original line number Diff line number Diff line
@@ -2086,9 +2086,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
			Override pmtimer IOPort with a hex value.
			e.g. pmtmr=0x508

	pnp.debug	[PNP]
			Enable PNP debug messages.  This depends on the
			CONFIG_PNP_DEBUG_MESSAGES option.
	pnp.debug=1	[PNP]
			Enable PNP debug messages (depends on the
			CONFIG_PNP_DEBUG_MESSAGES option).  Change at run-time
			via /sys/module/pnp/parameters/debug.  We always show
			current resource usage; turning this on also shows
			possible settings and some assignment information.

	pnpacpi=	[ACPI]
			{ off }
+2 −1
Original line number Diff line number Diff line
Note: This driver doesn't have a maintainer.

Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver for Linux.

This program is free software; you can redistribute it and/or
@@ -55,7 +57,6 @@ Test and make sure PCI latency is now correct for all cases.
Authors:

Sten Wang <sten_wang@davicom.com.tw >   : Original Author
Tobias Ringstrom <tori@unhappy.mine.nu> : Current Maintainer

Contributors:

+18 −5
Original line number Diff line number Diff line
@@ -1278,7 +1278,6 @@ F: drivers/input/misc/ati_remote2.c
ATLX ETHERNET DRIVERS
M:	Jay Cliburn <jcliburn@gmail.com>
M:	Chris Snook <chris.snook@gmail.com>
M:	Jie Yang <jie.yang@atheros.com>
L:	netdev@vger.kernel.org
W:	http://sourceforge.net/projects/atl1
W:	http://atl1.sourceforge.net
@@ -1574,7 +1573,6 @@ F: drivers/scsi/bfa/

BROCADE BNA 10 GIGABIT ETHERNET DRIVER
M:	Rasesh Mody <rmody@brocade.com>
M:	Debashis Dutt <ddutt@brocade.com>
L:	netdev@vger.kernel.org
S:	Supported
F:	drivers/net/bna/
@@ -1758,7 +1756,6 @@ F: Documentation/zh_CN/

CISCO VIC ETHERNET NIC DRIVER
M:	Christian Benvenuti <benve@cisco.com>
M:	Vasanthy Kolluri <vkolluri@cisco.com>
M:	Roopa Prabhu <roprabhu@cisco.com>
M:	David Wang <dwang2@cisco.com>
S:	Supported
@@ -3262,6 +3259,17 @@ F: Documentation/input/multi-touch-protocol.txt
F:	drivers/input/input-mt.c
K:	\b(ABS|SYN)_MT_

INTEL C600 SERIES SAS CONTROLLER DRIVER
M:	Intel SCU Linux support <intel-linux-scu@intel.com>
M:	Dan Williams <dan.j.williams@intel.com>
M:	Dave Jiang <dave.jiang@intel.com>
M:	Ed Nadolski <edmund.nadolski@intel.com>
L:	linux-scsi@vger.kernel.org
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git
S:	Maintained
F:	drivers/scsi/isci/
F:	firmware/isci/

INTEL IDLE DRIVER
M:	Len Brown <lenb@kernel.org>
L:	linux-pm@lists.linux-foundation.org
@@ -4404,7 +4412,8 @@ L: netfilter@vger.kernel.org
L:	coreteam@netfilter.org
W:	http://www.netfilter.org/
W:	http://www.iptables.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
S:	Supported
F:	include/linux/netfilter*
F:	include/linux/netfilter/
@@ -4774,7 +4783,7 @@ F: drivers/net/wireless/orinoco/

OSD LIBRARY and FILESYSTEM
M:	Boaz Harrosh <bharrosh@panasas.com>
M:	Benny Halevy <bhalevy@panasas.com>
M:	Benny Halevy <bhalevy@tonian.com>
L:	osd-dev@open-osd.org
W:	http://open-osd.org
T:	git git://git.open-osd.org/open-osd.git
@@ -7200,6 +7209,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
S:	Supported
F:	Documentation/hwmon/wm83??
F:	drivers/leds/leds-wm83*.c
F:	drivers/input/misc/wm831x-on.c
F:	drivers/input/touchscreen/wm831x-ts.c
F:	drivers/input/touchscreen/wm97*.c
F:	drivers/mfd/wm8*.c
F:	drivers/power/wm83*.c
F:	drivers/rtc/rtc-wm83*.c
@@ -7209,6 +7221,7 @@ F: drivers/watchdog/wm83*_wdt.c
F:	include/linux/mfd/wm831x/
F:	include/linux/mfd/wm8350/
F:	include/linux/mfd/wm8400*
F:	include/linux/wm97xx.h
F:	include/sound/wm????.h
F:	sound/soc/codecs/wm*

Loading