Commit 24844fd3 authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Merge branch 'mm-rst' into docs-next 

Mike Rapoport says:

  These patches convert files in Documentation/vm to ReST format, add an
  initial index and link it to the top level documentation.

  There are no contents changes in the documentation, except few spelling
  fixes. The relatively large diffstat stems from the indentation and
  paragraph wrapping changes.

  I've tried to keep the formatting as consistent as possible, but I could
  miss some places that needed markup and add some markup where it was not
  necessary.

[jc: significant conflicts in vm/hmm.rst]
parents 32fb7ef6 82381918

Documentation/ABI/stable/sysfs-devices-node

+1 −1
Original line number Diff line number Diff line
@@ -90,4 +90,4 @@ Date: December 2009 
Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>

Description:

		The node's huge page size control/query attributes.

		See Documentation/vm/hugetlbpage.txt
 
 No newline at end of file
 
		See Documentation/vm/hugetlbpage.rst
 
 No newline at end of file

Documentation/ABI/testing/sysfs-kernel-mm-hugepages

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ Description: 
			free_hugepages

			surplus_hugepages

			resv_hugepages

		See Documentation/vm/hugetlbpage.txt for details.
 
		See Documentation/vm/hugetlbpage.rst for details.

Documentation/ABI/testing/sysfs-kernel-mm-ksm

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Description: Kernel Samepage Merging daemon sysfs interface 
		sleep_millisecs: how many milliseconds ksm should sleep between

		scans.



		See Documentation/vm/ksm.txt for more information.

		See Documentation/vm/ksm.rst for more information.



What:		/sys/kernel/mm/ksm/merge_across_nodes

Date:		January 2013

Documentation/ABI/testing/sysfs-kernel-slab

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Description: 
		The alloc_calls file is read-only and lists the kernel code

		locations from which allocations for this cache were performed.

		The alloc_calls file only contains information if debugging is

		enabled for that cache (see Documentation/vm/slub.txt).

		enabled for that cache (see Documentation/vm/slub.rst).



What:		/sys/kernel/slab/cache/alloc_fastpath

Date:		February 2008
@@ -219,7 +219,7 @@ Contact: Pekka Enberg <penberg@cs.helsinki.fi>, 
Description:

		The free_calls file is read-only and lists the locations of

		object frees if slab debugging is enabled (see

		Documentation/vm/slub.txt).

		Documentation/vm/slub.rst).



What:		/sys/kernel/slab/cache/free_fastpath

Date:		February 2008

Documentation/admin-guide/kernel-parameters.txt

+6 −6
Original line number Diff line number Diff line
@@ -3915,7 +3915,7 @@ 
			cache (risks via metadata attacks are mostly

			unchanged). Debug options disable merging on their

			own.

			For more information see Documentation/vm/slub.txt.

			For more information see Documentation/vm/slub.rst.



	slab_max_order=	[MM, SLAB]

			Determines the maximum allowed order for slabs.
@@ -3929,7 +3929,7 @@ 
			slub_debug can create guard zones around objects and

			may poison objects when not in use. Also tracks the

			last alloc / free. For more information see

			Documentation/vm/slub.txt.

			Documentation/vm/slub.rst.



	slub_memcg_sysfs=	[MM, SLUB]

			Determines whether to enable sysfs directories for
@@ -3943,7 +3943,7 @@ 
			Determines the maximum allowed order for slabs.

			A high setting may cause OOMs due to memory

			fragmentation. For more information see

			Documentation/vm/slub.txt.

			Documentation/vm/slub.rst.



	slub_min_objects=	[MM, SLUB]

			The minimum number of objects per slab. SLUB will
@@ -3952,12 +3952,12 @@ 
			the number of objects indicated. The higher the number

			of objects the smaller the overhead of tracking slabs

			and the less frequently locks need to be acquired.

			For more information see Documentation/vm/slub.txt.

			For more information see Documentation/vm/slub.rst.



	slub_min_order=	[MM, SLUB]

			Determines the minimum page order for slabs. Must be

			lower than slub_max_order.

			For more information see Documentation/vm/slub.txt.

			For more information see Documentation/vm/slub.rst.



	slub_nomerge	[MM, SLUB]

			Same with slab_nomerge. This is supported for legacy.
@@ -4313,7 +4313,7 @@ 
			Format: [always|madvise|never]

			Can be used to control the default behavior of the system

			with respect to transparent hugepages.

			See Documentation/vm/transhuge.txt for more details.

			See Documentation/vm/transhuge.rst for more details.



	tsc=		Disable clocksource stability checks for TSC.

			Format: <string>