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

Commit bcec5b49 authored by Kiran Raparthy's avatar Kiran Raparthy
Browse files

Merge commit 'fe96ce17' into HEAD 



Change-Id: Ib3202ce3bacc66a96629b796e3324fc7f70919c9
Signed-off-by: default avatarKiran Raparthy <kraparth@codeaurora.org>
parents 07017009 fe96ce17

Documentation/ABI/testing/sysfs-block-zram

+10 −0
Original line number Diff line number Diff line
@@ -137,3 +137,13 @@ Description: 
		The writeback_limit file is read-write and specifies the maximum

		amount of writeback ZRAM can do. The limit could be changed

		in run time.



What:		/sys/block/zram<id>/use_dedup

Date:		March 2017

Contact:	Joonsoo Kim <iamjoonsoo.kim@lge.com>

Description:

		The use_dedup file is read-write and specifies deduplication

		feature is used or not. If enabled, duplicated data is

		managed by reference count and will not be stored in memory

		twice. Benefit of this feature largely depends on the workload

		so keep attention when use.

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ stable kernels. 
| ARM            | Cortex-A72      | #853709         | N/A                         |

| ARM            | Cortex-A73      | #858921         | ARM64_ERRATUM_858921        |

| ARM            | Cortex-A55      | #1024718        | ARM64_ERRATUM_1024718       |

| ARM            | Cortex-A76      | #1463225        | ARM64_ERRATUM_1463225       |

| ARM            | MMU-500         | #841119,#826419 | N/A                         |

|                |                 |                 |                             |

| Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375        |

Documentation/blockdev/zram.txt

+3 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ compact WO trigger memory compaction 
debug_stat        	RO	this file is used for zram debugging purposes

backing_dev	  	RW	set up backend storage for zram to write out

idle		  	WO	mark allocated slot as idle



use_dedup		RW	show and set deduplication feature



User space is advised to use the following files to read the device statistics.
@@ -223,6 +223,8 @@ line of text and contains the following stats separated by whitespace: 
                  No memory is allocated for such pages.

 pages_compacted  the number of pages freed during compaction

 huge_pages	  the number of incompressible pages

 dup_data_size	  deduplicated data size

 meta_data_size	  the amount of metadata allocated for deduplication feature



File /sys/block/zram<id>/bd_stat

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ needs_sphinx = '1.3' 
extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure', 'sphinx.ext.ifconfig']



# The name of the math extension changed on Sphinx 1.4

if major == 1 and minor > 3:

if (major == 1 and minor > 3) or (major > 1):

    extensions.append("sphinx.ext.imgmath")

else:

    extensions.append("sphinx.ext.pngmath")

Documentation/dev-tools/gcov.rst

+14 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ Configure the kernel with:: 
        CONFIG_DEBUG_FS=y

        CONFIG_GCOV_KERNEL=y



select the gcc's gcov format, default is autodetect based on gcc version::



        CONFIG_GCOV_FORMAT_AUTODETECT=y



and to get coverage data for the entire kernel::



        CONFIG_GCOV_PROFILE_ALL=y
@@ -169,6 +165,20 @@ b) gcov is run on the BUILD machine 
      [user@build] gcov -o /tmp/coverage/tmp/out/init main.c





Note on compilers

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



GCC and LLVM gcov tools are not necessarily compatible. Use gcov_ to work with

GCC-generated .gcno and .gcda files, and use llvm-cov_ for Clang.



.. _gcov: http://gcc.gnu.org/onlinedocs/gcc/Gcov.html

.. _llvm-cov: https://llvm.org/docs/CommandGuide/llvm-cov.html



Build differences between GCC and Clang gcov are handled by Kconfig. It

automatically selects the appropriate gcov format depending on the detected

toolchain.





Troubleshooting

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