Commit f2b220ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'docs-6.1-2' of git://git.lwn.net/linux 

Pull documentation fixes from Jonathan Corbet:
 "A handful of relatively simple documentation fixes, plus a set of
  patches catching the Chinese translation up with the front-page
  rework"

* tag 'docs-6.1-2' of git://git.lwn.net/linux:
  Documentation: rtla: Correct command line example
  docs/zh_CN: add a man-pages link to zh_CN/index.rst
  docs/zh_CN: Rewrite the Chinese translation front page
  docs/zh_CN: add zh_CN/arch.rst
  docs/zh_CN: promote the title of zh_CN/process/index.rst
  docs/zh_CN: Update the translation of page_owner to 6.0-rc7
  docs/zh_CN: Update the translation of ksm to 6.0-rc7
  docs/howto: Replace abundoned URL of gmane.org
  Documentation: ubifs: Fix compression idiom
  Documentation/mm/page_owner.rst: delete frequently changing experimental data
  docs/zh_CN: Fix build warning
  docs: ftrace: Correct access mode
parents 66ae0436 877d95dc

Documentation/filesystems/ubifs.rst

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ differences. 
* JFFS2 is a write-through file-system, while UBIFS supports write-back,

  which makes UBIFS much faster on writes.



Similarly to JFFS2, UBIFS supports on-the-flight compression which makes

Similarly to JFFS2, UBIFS supports on-the-fly compression which makes

it possible to fit quite a lot of data to the flash.



Similarly to JFFS2, UBIFS is tolerant of unclean reboots and power-cuts.

Documentation/mm/page_owner.rst

+4 −16
Original line number Diff line number Diff line
@@ -38,22 +38,10 @@ not affect to allocation performance, especially if the static keys jump 
label patching functionality is available. Following is the kernel's code

size change due to this facility.



- Without page owner::



   text    data     bss     dec     hex filename

   48392   2333     644   51369    c8a9 mm/page_alloc.o



- With page owner::



   text    data     bss     dec     hex filename

   48800   2445     644   51889    cab1 mm/page_alloc.o

   6662     108      29    6799    1a8f mm/page_owner.o

   1025       8       8    1041     411 mm/page_ext.o



Although, roughly, 8 KB code is added in total, page_alloc.o increase by

520 bytes and less than half of it is in hotpath. Building the kernel with

page owner and turning it on if needed would be great option to debug

kernel memory problem.

Although enabling page owner increases kernel size by several kilobytes,

most of this code is outside page allocator and its hot path. Building

the kernel with page owner and turning it on if needed would be great

option to debug kernel memory problem.



There is one notice that is caused by implementation detail. page owner

stores information into the memory from struct page extension. This memory

Documentation/process/howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ to subscribe and unsubscribe from the list can be found at: 
There are archives of the mailing list on the web in many different

places.  Use a search engine to find these archives.  For example:



	http://dir.gmane.org/gmane.linux.kernel

	https://lore.kernel.org/lkml/



It is highly recommended that you search the archives about the topic

you want to bring up, before you post it to the list. A lot of things

Documentation/tools/rtla/rtla-timerlat-top.rst

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ higher than *30 us*. It is also set to stop the session if a *Thread* timer 
latency higher than *30 us* is hit. Finally, it is set to save the trace

buffer if the stop condition is hit::



  [root@alien ~]# rtla timerlat top -s 30 -t 30 -T

  [root@alien ~]# rtla timerlat top -s 30 -T 30 -t

                   Timer Latency

    0 00:00:59   |          IRQ Timer Latency (us)        |         Thread Timer Latency (us)

  CPU COUNT      |      cur       min       avg       max |      cur       min       avg       max

Documentation/trace/ftrace.rst

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ of ftrace. Here is a list of some of the key files: 


	start::



		trace_fd = open("trace_marker", WR_ONLY);

		trace_fd = open("trace_marker", O_WRONLY);



	Note: Writing into the trace_marker file can also initiate triggers

	      that are written into /sys/kernel/tracing/events/ftrace/print/trigger