Commit 435a7743 authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Merge branch 'mauro' into docs-next 

A big set of fixes and RST conversions from Mauro.  He swears that this is
the last RST conversion set, which is certainly cause for celebration.
parents 0b227076 4ac25081

Documentation/ABI/testing/sysfs-driver-w1_therm

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Description: 
		to device min/max capabilities. Values are integer as they are

		stored in a 8bit register in the device. Lowest value is

		automatically put to TL. Once set, alarms could be search at

		master level, refer to Documentation/w1/w1_generic.rst for

		master level, refer to Documentation/w1/w1-generic.rst for

		detailed information

Users:		any user space application which wants to communicate with

		w1_term device

Documentation/PCI/pci.rst

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ Set the DMA mask size 
---------------------

.. note::

   If anything below doesn't make sense, please refer to

   Documentation/DMA-API.txt. This section is just a reminder that

   :doc:`/core-api/dma-api`. This section is just a reminder that

   drivers need to indicate DMA capabilities of the device and is not

   an authoritative source for DMA interfaces.
@@ -291,7 +291,7 @@ Many 64-bit "PCI" devices (before PCI-X) and some PCI-X devices are 
Setup shared control data

-------------------------

Once the DMA masks are set, the driver can allocate "consistent" (a.k.a. shared)

memory.  See Documentation/DMA-API.txt for a full description of

memory.  See :doc:`/core-api/dma-api` for a full description of

the DMA APIs. This section is just a reminder that it needs to be done

before enabling DMA on the device.
@@ -421,7 +421,7 @@ owners if there is one. 


Then clean up "consistent" buffers which contain the control data.



See Documentation/DMA-API.txt for details on unmapping interfaces.

See :doc:`/core-api/dma-api` for details on unmapping interfaces.





Unregister from other subsystems

Documentation/admin-guide/mm/hugetlbpage.rst

+17 −6
Original line number Diff line number Diff line
@@ -101,37 +101,48 @@ be specified in bytes with optional scale suffix [kKmMgG]. The default huge 
page size may be selected with the "default_hugepagesz=<size>" boot parameter.



Hugetlb boot command line parameter semantics

hugepagesz - Specify a huge page size.  Used in conjunction with hugepages



hugepagesz

	Specify a huge page size.  Used in conjunction with hugepages

	parameter to preallocate a number of huge pages of the specified

	size.  Hence, hugepagesz and hugepages are typically specified in

	pairs such as:

	pairs such as::



		hugepagesz=2M hugepages=512



	hugepagesz can only be specified once on the command line for a

	specific huge page size.  Valid huge page sizes are architecture

	dependent.

hugepages - Specify the number of huge pages to preallocate.  This typically

hugepages

	Specify the number of huge pages to preallocate.  This typically

	follows a valid hugepagesz or default_hugepagesz parameter.  However,

	if hugepages is the first or only hugetlb command line parameter it

	implicitly specifies the number of huge pages of default size to

	allocate.  If the number of huge pages of default size is implicitly

	specified, it can not be overwritten by a hugepagesz,hugepages

	parameter pair for the default size.

	For example, on an architecture with 2M default huge page size:



	For example, on an architecture with 2M default huge page size::



		hugepages=256 hugepagesz=2M hugepages=512



	will result in 256 2M huge pages being allocated and a warning message

	indicating that the hugepages=512 parameter is ignored.  If a hugepages

	parameter is preceded by an invalid hugepagesz parameter, it will

	be ignored.

default_hugepagesz - Specify the default huge page size.  This parameter can

default_hugepagesz

	pecify the default huge page size.  This parameter can

	only be specified once on the command line.  default_hugepagesz can

	optionally be followed by the hugepages parameter to preallocate a

	specific number of huge pages of default size.  The number of default

	sized huge pages to preallocate can also be implicitly specified as

	mentioned in the hugepages section above.  Therefore, on an

	architecture with 2M default huge page size:

	architecture with 2M default huge page size::



		hugepages=256

		default_hugepagesz=2M hugepages=256

		hugepages=256 default_hugepagesz=2M



	will all result in 256 2M huge pages being allocated.  Valid default

	huge page size is architecture dependent.

Documentation/admin-guide/mm/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ the Linux memory management. 
   idle_page_tracking

   ksm

   memory-hotplug

   nommu-map

   numa_memory_policy

   numaperf

   pagemap