OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Revert "scripts/kerneldoc: For Sphinx 3 use c:macro for macros with arguments" 

This reverts commit 92bb29f9b2.
We will replace the commit with the fix from Linux.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20201117165312.118257-15-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-11-17 17:52:57 +01:00
parent 306b015cfb
commit a832c9844d
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/kernel-doc
View File

@ -860,23 +860,7 @@ sub output_function_rst(%) {
output_highlight_rst($args{'purpose'});
$start = "\n\n**Syntax**\n\n ``";
} else {
if ((split(/\./, $sphinx_version))[0] >= 3) {
# Sphinx 3 and later distinguish macros and functions and
# complain if you use c:function with something that's not
# syntactically valid as a function declaration.
# We assume that anything with a return type is a function
# and anything without is a macro.
if ($args{'functiontype'} ne "") {
print ".. c:function:: ";
} else {
print ".. c:macro:: ";
}
} else {
# Older Sphinx don't support documenting macros that take
# arguments with c:macro, and don't complain about the use
# of c:function for this.
print ".. c:function:: ";
}
print ".. c:function:: ";
}
if ($args{'functiontype'} ne "") {
$start .= $args{'functiontype'} . " " . $args{'function'} . " (";