Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
e3213918
Commit
e3213918
authored
Sep 15, 2009
by
Stephen Rothwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'quilt/kernel-doc'
parents
150b6918
d5fbe7da
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
8 deletions
+20
-8
Documentation/kernel-doc-nano-HOWTO.txt
Documentation/kernel-doc-nano-HOWTO.txt
+3
-1
Documentation/kref.txt
Documentation/kref.txt
+0
-1
mm/mmap.c
mm/mmap.c
+1
-1
scripts/kernel-doc
scripts/kernel-doc
+16
-5
No files found.
Documentation/kernel-doc-nano-HOWTO.txt
View file @
e3213918
...
...
@@ -66,7 +66,9 @@ Example kernel-doc function comment:
* The longer description can have multiple paragraphs.
*/
The first line, with the short description, must be on a single line.
The short description following the subject can span multiple lines
and ends with an @argument description, an empty line or the end of
the comment block.
The @argument descriptions must begin on the very next line following
this opening short function description line, with no intervening
...
...
Documentation/kref.txt
View file @
e3213918
...
...
@@ -84,7 +84,6 @@ int my_data_handler(void)
task = kthread_run(more_data_handling, data, "more_data_handling");
if (task == ERR_PTR(-ENOMEM)) {
rv = -ENOMEM;
kref_put(&data->refcount, data_release);
goto out;
}
...
...
mm/mmap.c
View file @
e3213918
...
...
@@ -905,7 +905,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
#endif
/* CONFIG_PROC_FS */
/*
* The caller must hold down_write(current->mm->mmap_sem).
* The caller must hold down_write(
&
current->mm->mmap_sem).
*/
unsigned
long
do_mmap_pgoff
(
struct
file
*
file
,
unsigned
long
addr
,
...
...
scripts/kernel-doc
View file @
e3213918
...
...
@@ -1995,6 +1995,7 @@ sub process_file($) {
my
$identifier
;
my
$func
;
my
$descr
;
my
$in_purpose
=
0
;
my
$initial_section_counter
=
$section_counter
;
if
(
defined
(
$ENV
{'
SRCTREE
'}))
{
...
...
@@ -2044,6 +2045,7 @@ sub process_file($) {
$descr
=~
s/\s*$//
;
$descr
=~
s/\s+/ /
;
$declaration_purpose
=
xml_escape
(
$descr
);
$in_purpose
=
1
;
}
else
{
$declaration_purpose
=
"";
}
...
...
@@ -2090,6 +2092,7 @@ sub process_file($) {
}
$in_doc_sect
=
1
;
$in_purpose
=
0
;
$contents
=
$newcontents
;
if
(
$contents
ne
"")
{
while
((
substr
(
$contents
,
0
,
1
)
eq
"
")
||
...
...
@@ -2119,11 +2122,19 @@ sub process_file($) {
}
elsif
(
/$doc_content/
)
{
# miguel-style comment kludge, look for blank lines after
# @parameter line to signify start of description
if
(
$1
eq
""
&&
(
$section
=~
m/^@/
||
$section
eq
$section_context
))
{
dump_section
(
$file
,
$section
,
xml_escape
(
$contents
));
$section
=
$section_default
;
$contents
=
"";
if
(
$1
eq
"")
{
if
(
$section
=~
m/^@/
||
$section
eq
$section_context
)
{
dump_section
(
$file
,
$section
,
xml_escape
(
$contents
));
$section
=
$section_default
;
$contents
=
"";
}
else
{
$contents
.=
"
\n
";
}
$in_purpose
=
0
;
}
elsif
(
$in_purpose
==
1
)
{
# Continued declaration purpose
chomp
(
$declaration_purpose
);
$declaration_purpose
.=
"
"
.
xml_escape
(
$1
);
}
else
{
$contents
.=
$1
.
"
\n
";
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment