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

Commit c226951b authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents b0df3bd1 e8216dee
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -1363,6 +1363,11 @@ running once the system is up.

	reserve=	[KNL,BUGS] Force the kernel to ignore some iomem area

	reservetop=	[IA-32]
			Format: nn[KMG]
			Reserves a hole at the top of the kernel virtual
			address space.

	resume=		[SWSUSP]
			Specify the partition device for software suspend

+5 −3
Original line number Diff line number Diff line
DCCP protocol
============

Last updated: 10 November 2005

Contents
========
@@ -42,8 +41,11 @@ Socket options
DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for
calculations.

DCCP_SOCKOPT_SERVICE sets the service. This is compulsory as per the
specification. If you don't set it you will get EPROTO.
DCCP_SOCKOPT_SERVICE sets the service. The specification mandates use of
service codes (RFC 4340, sec. 8.1.2); if this socket option is not set,
the socket will fall back to 0 (which means that no meaningful service code
is present). Connecting sockets set at most one service option; for
listening sockets, multiple service codes can be specified.

Notes
=====
+15 −0
Original line number Diff line number Diff line
@@ -52,3 +52,18 @@ suspend image will be as small as possible.

Reading from this file will display the current image size limit, which
is set to 500 MB by default.

/sys/power/pm_trace controls the code which saves the last PM event point in
the RTC across reboots, so that you can debug a machine that just hangs
during suspend (or more commonly, during resume).  Namely, the RTC is only
used to save the last PM event point if this file contains '1'.  Initially it
contains '0' which may be changed to '1' by writing a string representing a
nonzero integer into it.

To use this debugging feature you should attempt to suspend the machine, then
reboot it and run

	dmesg -s 1000000 | grep 'hash matches'

CAUTION: Using it will cause your machine's real-time (CMOS) clock to be
set to a random invalid time after a resume.
+20 −7
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Currently, these files are in /proc/sys/vm:
- drop-caches
- zone_reclaim_mode
- min_unmapped_ratio
- min_slab_ratio
- panic_on_oom

==============================================================
@@ -138,7 +139,6 @@ This is value ORed together of
1	= Zone reclaim on
2	= Zone reclaim writes dirty pages out
4	= Zone reclaim swaps pages
8	= Also do a global slab reclaim pass

zone_reclaim_mode is set during bootup to 1 if it is determined that pages
from remote zones will cause a measurable performance reduction. The
@@ -162,18 +162,13 @@ Allowing regular swap effectively restricts allocations to the local
node unless explicitly overridden by memory policies or cpuset
configurations.

It may be advisable to allow slab reclaim if the system makes heavy
use of files and builds up large slab caches. However, the slab
shrink operation is global, may take a long time and free slabs
in all nodes of the system.

=============================================================

min_unmapped_ratio:

This is available only on NUMA kernels.

A percentage of the file backed pages in each zone.  Zone reclaim will only
A percentage of the total pages in each zone.  Zone reclaim will only
occur if more than this percentage of pages are file backed and unmapped.
This is to insure that a minimal amount of local pages is still available for
file I/O even if the node is overallocated.
@@ -182,6 +177,24 @@ The default is 1 percent.

=============================================================

min_slab_ratio:

This is available only on NUMA kernels.

A percentage of the total pages in each zone.  On Zone reclaim
(fallback from the local zone occurs) slabs will be reclaimed if more
than this percentage of pages in a zone are reclaimable slab pages.
This insures that the slab growth stays under control even in NUMA
systems that rarely perform global reclaim.

The default is 5 percent.

Note that slab reclaim is triggered in a per zone / node fashion.
The process of reclaiming slab memory is currently not node specific
and may not be fast.

=============================================================

panic_on_oom

This enables or disables panic on out-of-memory feature.  If this is set to 1,
+24 −0
Original line number Diff line number Diff line
@@ -443,6 +443,23 @@ W: http://people.redhat.com/sgrubb/audit/
T:	git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
S:	Maintained

AVR32 ARCHITECTURE
P:	Atmel AVR32 Support Team
M:	avr32@atmel.com
P:	Haavard Skinnemoen
M:	hskinnemoen@atmel.com
W:	http://www.atmel.com/products/AVR32/
W:	http://avr32linux.org/
W:	http://avrfreaks.net/
S:	Supported

AVR32/AT32AP MACHINE SUPPORT
P:	Atmel AVR32 Support Team
M:	avr32@atmel.com
P:	Haavard Skinnemoen
M:	hskinnemoen@atmel.com
S:	Supported

AX.25 NETWORK LAYER
P:	Ralf Baechle
M:	ralf@linux-mips.org
@@ -2031,6 +2048,13 @@ L: netfilter@lists.netfilter.org
L:	netfilter-devel@lists.netfilter.org
S:	Supported

NETLABEL
P:	Paul Moore
M:	paul.moore@hp.com
W:	http://netlabel.sf.net
L:	netdev@vger.kernel.org
S:	Supported

NETROM NETWORK LAYER
P:	Ralf Baechle
M:	ralf@linux-mips.org
Loading