Commit 647681bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more documentation updates from Jonathan Corbet:
 "A handful of late-arriving documentation fixes, plus one Spanish
  translation that has been ready for some time but got applied late"

* tag 'docs-6.4-2' of git://git.lwn.net/linux:
  docs/sp_SP: Add translation of process/adding-syscalls
  CREDITS: Update email address for Mat Martineau
  Documentation: update kernel stack for x86_64
  docs: Remove unnecessary unicode character
  docs: fix "Reviewd" typo
  Documentation: timers: hrtimers: Make hybrid union historical
  docs/admin-guide/mm/ksm.rst fix intraface -> interface typo
  doc:it_IT: fix some typos
parents e919a3f7 cdc822dd

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -2510,8 +2510,8 @@ D: XF86_8514 
D: cfdisk (curses based disk partitioning program)



N: Mat Martineau

E: mat@martineau.name

D: MPTCP subsystem co-maintainer 2020-2023

E: martineau@kernel.org

D: MPTCP subsystem co-maintainer

D: Keyctl restricted keyring and Diffie-Hellman UAPI

D: Bluetooth L2CAP ERTM mode and AMP

S: USA

Documentation/admin-guide/mm/ksm.rst

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ content which can be replaced by a single write-protected page (which 
is automatically copied if a process later wants to update its

content). The amount of pages that KSM daemon scans in a single pass

and the time between the passes are configured using :ref:`sysfs

intraface <ksm_sysfs>`

interface <ksm_sysfs>`



KSM only merges anonymous (private) pages, never pagecache (file) pages.

KSM's merged pages were originally locked into kernel memory, but can now

Documentation/arch/x86/kernel-stacks.rst

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Most of the text from Keith Owens, hacked by AK 
x86_64 page size (PAGE_SIZE) is 4K.



Like all other architectures, x86_64 has a kernel stack for every

active thread.  These thread stacks are THREAD_SIZE (2*PAGE_SIZE) big.

active thread.  These thread stacks are THREAD_SIZE (4*PAGE_SIZE) big.

These stacks contain useful data as long as a thread is alive or a

zombie. While the thread is in user space the kernel stack is empty

except for the thread_info structure at the bottom.

Documentation/timers/hrtimers.rst

+7 −12
Original line number Diff line number Diff line
@@ -123,17 +123,12 @@ equivalent to timer_delete() and timer_delete_sync()] - so there's no direct 
potential for code sharing either.



Basic data types: every time value, absolute or relative, is in a

special nanosecond-resolution type: ktime_t. The kernel-internal

representation of ktime_t values and operations is implemented via

macros and inline functions, and can be switched between a "hybrid

union" type and a plain "scalar" 64bit nanoseconds representation (at

compile time). The hybrid union type optimizes time conversions on 32bit

CPUs. This build-time-selectable ktime_t storage format was implemented

to avoid the performance impact of 64-bit multiplications and divisions

on 32bit CPUs. Such operations are frequently necessary to convert

between the storage formats provided by kernel and userspace interfaces

and the internal time format. (See include/linux/ktime.h for further

details.)

special nanosecond-resolution 64bit type: ktime_t.

(Originally, the kernel-internal representation of ktime_t values and

operations was implemented via macros and inline functions, and could be

switched between a "hybrid union" type and a plain "scalar" 64bit

nanoseconds representation (at compile time). This was abandoned in the

context of the Y2038 work.)



hrtimers - rounding of timer values

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

Documentation/translations/it_IT/kernel-hacking/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ alle corse critiche, dovreste usare timer_delete_sync() 
(``include/linux/timer.h``) per gestire questo caso.



Prima di rilasciare un temporizzatore dovreste chiamare la funzione

timer_shutdown() o timer_shutdown_sync() di modo che non venga più ricarmato.

timer_shutdown() o timer_shutdown_sync() di modo che non venga più riarmato.

Ogni successivo tentativo di riarmare il temporizzatore verrà silenziosamente

ignorato.