Merge remote-tracking branch 'torvalds/master' into perf/urgent (9434628f) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg

+4 −4

Original line number	Diff line number	Diff line
		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read.
		Set a_bus_req(A-device bus request) input to be 1 if
		@@ -17,7 +17,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read
		The a_bus_drop(A-device bus drop) input is 1 when the
		@@ -32,7 +32,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read.
		The b_bus_req(B-device bus request) input is 1 during the time
		@@ -47,7 +47,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_clr_err
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Only can be set.
		The a_clr_err(A-device Vbus error clear) input is used to clear

+2 −2

Original line number	Diff line number	Diff line
		@@ -1356,8 +1356,8 @@ PAGE_SIZE multiple when read back.

		thp_fault_alloc
		Number of transparent hugepages which were allocated to satisfy
		a page fault, including COW faults. This counter is not present
		when CONFIG_TRANSPARENT_HUGEPAGE is not set.
		a page fault. This counter is not present when CONFIG_TRANSPARENT_HUGEPAGE
		is not set.

		thp_collapse_alloc
		Number of transparent hugepages which were allocated to allow

+1 −0

+1 −2

Original line number	Diff line number	Diff line
		@@ -305,8 +305,7 @@ monitor how successfully the system is providing huge pages for use.

		thp_fault_alloc
		is incremented every time a huge page is successfully
		allocated to handle a page fault. This applies to both the
		first time a page is faulted and for COW faults.
		allocated to handle a page fault.

		thp_collapse_alloc
		is incremented by khugepaged when it has found

+14 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,20 @@ then the next program in the chain (A) will see those changes,
		not the original input ``setsockopt`` arguments. The potentially
		modified values will be then passed down to the kernel.

		Large optval
		============
		When the ``optval`` is greater than the ``PAGE_SIZE``, the BPF program
		can access only the first ``PAGE_SIZE`` of that data. So it has to options:

		* Set ``optlen`` to zero, which indicates that the kernel should
		use the original buffer from the userspace. Any modifications
		done by the BPF program to the ``optval`` are ignored.
		* Set ``optlen`` to the value less than ``PAGE_SIZE``, which
		indicates that the kernel should use BPF's trimmed ``optval``.

		When the BPF program returns with the ``optlen`` greater than
		``PAGE_SIZE``, the userspace will receive ``EFAULT`` errno.

		Example
		=======