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

Commit eb69548f authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Merge branch 'doc/4.9' into docs-next

parents 87171fb7 5219f18a

Documentation/ioctl/botching-up-ioctls.txt

+8 −5
Original line number Diff line number Diff line
@@ -34,15 +34,18 @@ will need to add a a 32-bit compat layer: 
   64-bit platforms do. So we always need padding to the natural size to get

   this right.



 * Pad the entire struct to a multiple of 64-bits - the structure size will

   otherwise differ on 32-bit versus 64-bit. Having a different structure size

   hurts when passing arrays of structures to the kernel, or if the kernel

   checks the structure size, which e.g. the drm core does.

 * Pad the entire struct to a multiple of 64-bits if the structure contains

   64-bit types - the structure size will otherwise differ on 32-bit versus

   64-bit. Having a different structure size hurts when passing arrays of

   structures to the kernel, or if the kernel checks the structure size, which

   e.g. the drm core does.



 * Pointers are __u64, cast from/to a uintprt_t on the userspace side and

   from/to a void __user * in the kernel. Try really hard not to delay this

   conversion or worse, fiddle the raw __u64 through your code since that

   diminishes the checking tools like sparse can provide.

   diminishes the checking tools like sparse can provide. The macro

   u64_to_user_ptr can be used in the kernel to avoid warnings about integers

   and pointres of different sizes.





Basics

Documentation/kernel-parameters.txt

+0 −2
Original line number Diff line number Diff line
@@ -2574,8 +2574,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	nodelayacct	[KNL] Disable per-task delay accounting



	nodisconnect	[HW,SCSI,M68K] Disables SCSI disconnects.



	nodsp		[SH] Disable hardware DSP at boot time.



	noefi		Disable EFI runtime services support.

Documentation/scsi/scsi-parameters.txt

+0 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ parameters may be changed at runtime by the command 


	ncr53c8xx=	[HW,SCSI]



	nodisconnect	[HW,SCSI,M68K] Disables SCSI disconnects.



	osst=		[HW,SCSI] SCSI Tape Driver

			Format: <buffer_size>,<write_threshold>

			See also Documentation/scsi/st.txt.

Documentation/x86/x86_64/mm.txt

+3 −3
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ ffffc90000000000 - ffffe8ffffffffff (=45 bits) vmalloc/ioremap space 
ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole

ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)

... unused hole ...

ffffec0000000000 - fffffc0000000000 (=44 bits) kasan shadow memory (16TB)

ffffec0000000000 - fffffbffffffffff (=44 bits) kasan shadow memory (16TB)

... unused hole ...

ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks

... unused hole ...

ffffffef00000000 - ffffffff00000000 (=64 GB) EFI region mapping space

ffffffef00000000 - fffffffeffffffff (=64 GB) EFI region mapping space

... unused hole ...

ffffffff80000000 - ffffffffa0000000 (=512 MB)  kernel text mapping, from phys 0

ffffffff80000000 - ffffffff9fffffff (=512 MB)  kernel text mapping, from phys 0

ffffffffa0000000 - ffffffffff5fffff (=1526 MB) module mapping space

ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls

ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole

scripts/kernel-doc

+4 −1
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ my $anon_struct_union = 0; 
my $type_constant = '\%([-_\w]+)';

my $type_func = '(\w+)\(\)';

my $type_param = '\@(\w+)';

my $type_fp_param = '\@(\w+)\(\)';  # Special RST handling for func ptr params

my $type_struct = '\&((struct\s*)*[_\w]+)';

my $type_struct_xml = '\\&amp;((struct\s*)*[_\w]+)';

my $type_env = '(\$\w+)';
@@ -292,6 +293,7 @@ my @highlights_rst = ( 
                       # Note: need to escape () to avoid func matching later

                       [$type_member_func, "\\:c\\:type\\:`\$1\$2\\\\(\\\\) <\$1>`"],

                       [$type_member, "\\:c\\:type\\:`\$1\$2 <\$1>`"],

		       [$type_fp_param, "**\$1\\\\(\\\\)**"],

                       [$type_func, "\\:c\\:func\\:`\$1()`"],

                       [$type_struct_full, "\\:c\\:type\\:`\$1 \$2 <\$2>`"],

                       [$type_enum_full, "\\:c\\:type\\:`\$1 \$2 <\$2>`"],
@@ -412,7 +414,7 @@ my $doc_com_body = '\s*\* ?'; 
my $doc_decl = $doc_com . '(\w+)';

# @params and a strictly limited set of supported section names

my $doc_sect = $doc_com . 

    '\s*(\@\w+|description|context|returns?|notes?|examples?)\s*:(.*)';

    '\s*(\@[.\w]+|\@\.\.\.|description|context|returns?|notes?|examples?)\s*:(.*)';

my $doc_content = $doc_com_body . '(.*)';

my $doc_block = $doc_com . 'DOC:\s*(.*)?';

my $doc_inline_start = '^\s*/\*\*\s*$';
@@ -2351,6 +2353,7 @@ sub push_parameter($$$) { 


	if ($type eq "" && $param =~ /\.\.\.$/)

	{

	    $param = "...";

	    if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") {

		$parameterdescs{$param} = "variable arguments";

	    }