Merge branch 'doc/4.9' into docs-next (87171fb7) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/Makefile.sphinx

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,12 +71,12 @@ ifeq ($(HAVE_PDFLATEX),0)
		$(warning The 'xelatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
		@echo " SKIP Sphinx $@ target."
		else # HAVE_PDFLATEX
		@$(call loop_cmd,sphinx,latex,.,latex,.)
		@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,latex,$(var),latex,$(var)))
		endif # HAVE_PDFLATEX

		pdfdocs: latexdocs
		ifneq ($(HAVE_PDFLATEX),0)
		$(Q)$(MAKE) PDFLATEX=xelatex LATEXOPTS="-interaction=nonstopmode" -C $(BUILDDIR)/latex
		$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX=xelatex LATEXOPTS="-interaction=nonstopmode" -C $(BUILDDIR)/$(var)/latex)
		endif # HAVE_PDFLATEX

		epubdocs:

Documentation/kernel-parameters.txt

+13 −7

Original line number	Diff line number	Diff line
		@@ -2161,10 +2161,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		than or equal to this physical address is ignored.

		maxcpus= [SMP] Maximum number of processors that an SMP kernel
		should make use of. maxcpus=n : n >= 0 limits the
		kernel to using 'n' processors. n=0 is a special case,
		it is equivalent to "nosmp", which also disables
		the IO APIC.
		will bring up during bootup. maxcpus=n : n >= 0 limits
		the kernel to bring up 'n' processors. Surely after
		bootup you can bring up the other plugged cpu by executing
		"echo 1 > /sys/devices/system/cpu/cpuX/online". So maxcpus
		only takes effect during system bootup.
		While n=0 is a special case, it is equivalent to "nosmp",
		which also disables the IO APIC.

		max_loop= [LOOP] The number of loop block devices that get
		(loop.max_loop) unconditionally pre-created at init time. The default
		@@ -2773,9 +2776,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

		nr_cpus= [SMP] Maximum number of processors that an SMP kernel
		could support. nr_cpus=n : n >= 1 limits the kernel to
		supporting 'n' processors. Later in runtime you can not
		use hotplug cpu feature to put more cpu back to online.
		just like you compile the kernel NR_CPUS=n
		support 'n' processors. It could be larger than the
		number of already plugged CPU during bootup, later in
		runtime you can physically add extra cpu until it reaches
		n. So during boot up some boot time memory for per-cpu
		variables need be pre-allocated for later physical cpu
		hot plugging.

		nr_uarts= [SERIAL] maximum number of UARTs to be registered.

Documentation/media/conf.py

+5 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,8 @@
		project = 'Linux Media Subsystem Documentation'

		tags.add("subproject")

		latex_documents = [
		('index', 'media.tex', 'Linux Media Subsystem Documentation',
		'The kernel development community', 'manual'),
		]

Documentation/sphinx/kernel-doc.py

+8 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@ from docutils.parsers.rst import directives
		from sphinx.util.compat import Directive
		from sphinx.ext.autodoc import AutodocReporter

		__version__ = '1.0'

		class KernelDocDirective(Directive):
		"""Extract kernel-doc comments from the specified file"""
		required_argument = 1
		@@ -139,3 +141,9 @@ def setup(app):
		app.add_config_value('kerneldoc_verbosity', 1, 'env')

		app.add_directive('kernel-doc', KernelDocDirective)

		return dict(
		version = __version__,
		parallel_read_safe = True,
		parallel_write_safe = True
		)

Documentation/sphinx/kernel_include.py

+7 −0

Original line number	Diff line number	Diff line
		@@ -39,11 +39,18 @@ from docutils.parsers.rst import directives
		from docutils.parsers.rst.directives.body import CodeBlock, NumberLines
		from docutils.parsers.rst.directives.misc import Include

		__version__ = '1.0'

		# ==============================================================================
		def setup(app):
		# ==============================================================================

		app.add_directive("kernel-include", KernelInclude)
		return dict(
		version = __version__,
		parallel_read_safe = True,
		parallel_write_safe = True
		)

		# ==============================================================================
		class KernelInclude(Include):