Merge da7df496b8 ("perf trace: Avoid garbage when not printing a syscall's arguments") into android16-6.12
Steps on the way to 6.12.2 Resolves merge conflicts in: fs/fuse/fuse_i.h Change-Id: If765bb10099fb7efad53a0a4bcda888cd571ac97 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
Treehugger Robot
+16
-21
@@ -3209,36 +3209,31 @@ sub process {
|
||||
|
||||
# Check Fixes: styles is correct
|
||||
if (!$in_header_lines &&
|
||||
$line =~ /^\s*fixes:?\s*(?:commit\s*)?[0-9a-f]{5,}\b/i) {
|
||||
my $orig_commit = "";
|
||||
my $id = "0123456789ab";
|
||||
my $title = "commit title";
|
||||
my $tag_case = 1;
|
||||
my $tag_space = 1;
|
||||
my $id_length = 1;
|
||||
my $id_case = 1;
|
||||
$line =~ /^\s*(fixes:?)\s*(?:commit\s*)?([0-9a-f]{5,40})(?:\s*($balanced_parens))?/i) {
|
||||
my $tag = $1;
|
||||
my $orig_commit = $2;
|
||||
my $title;
|
||||
my $title_has_quotes = 0;
|
||||
$fixes_tag = 1;
|
||||
|
||||
if ($line =~ /(\s*fixes:?)\s+([0-9a-f]{5,})\s+($balanced_parens)/i) {
|
||||
my $tag = $1;
|
||||
$orig_commit = $2;
|
||||
$title = $3;
|
||||
|
||||
$tag_case = 0 if $tag eq "Fixes:";
|
||||
$tag_space = 0 if ($line =~ /^fixes:? [0-9a-f]{5,} ($balanced_parens)/i);
|
||||
|
||||
$id_length = 0 if ($orig_commit =~ /^[0-9a-f]{12}$/i);
|
||||
$id_case = 0 if ($orig_commit !~ /[A-F]/);
|
||||
|
||||
if (defined $3) {
|
||||
# Always strip leading/trailing parens then double quotes if existing
|
||||
$title = substr($title, 1, -1);
|
||||
$title = substr($3, 1, -1);
|
||||
if ($title =~ /^".*"$/) {
|
||||
$title = substr($title, 1, -1);
|
||||
$title_has_quotes = 1;
|
||||
}
|
||||
} else {
|
||||
$title = "commit title"
|
||||
}
|
||||
|
||||
|
||||
my $tag_case = not ($tag eq "Fixes:");
|
||||
my $tag_space = not ($line =~ /^fixes:? [0-9a-f]{5,40} ($balanced_parens)/i);
|
||||
|
||||
my $id_length = not ($orig_commit =~ /^[0-9a-f]{12}$/i);
|
||||
my $id_case = not ($orig_commit !~ /[A-F]/);
|
||||
|
||||
my $id = "0123456789ab";
|
||||
my ($cid, $ctitle) = git_commit_info($orig_commit, $id,
|
||||
$title);
|
||||
|
||||
|
||||
+1
-1
@@ -252,7 +252,7 @@ __faddr2line() {
|
||||
found=2
|
||||
break
|
||||
fi
|
||||
done < <(echo "${ELF_SYMS}" | sed 's/\[.*\]//' | ${AWK} -v sec=$sym_sec '$7 == sec' | sort --key=2 | ${GREP} -A1 --no-group-separator " ${sym_name}$")
|
||||
done < <(echo "${ELF_SYMS}" | sed 's/\[.*\]//' | ${AWK} -v sec=$sym_sec '$7 == sec' | sort --key=2)
|
||||
|
||||
if [[ $found = 0 ]]; then
|
||||
warn "can't find symbol: sym_name: $sym_name sym_sec: $sym_sec sym_addr: $sym_addr sym_elf_size: $sym_elf_size"
|
||||
|
||||
+31
-16
@@ -569,6 +569,8 @@ sub output_function_man(%) {
|
||||
my %args = %{$_[0]};
|
||||
my ($parameter, $section);
|
||||
my $count;
|
||||
my $func_macro = $args{'func_macro'};
|
||||
my $paramcount = $#{$args{'parameterlist'}}; # -1 is empty
|
||||
|
||||
print ".TH \"$args{'function'}\" 9 \"$args{'function'}\" \"$man_date\" \"Kernel Hacker's Manual\" LINUX\n";
|
||||
|
||||
@@ -600,7 +602,10 @@ sub output_function_man(%) {
|
||||
$parenth = "";
|
||||
}
|
||||
|
||||
print ".SH ARGUMENTS\n";
|
||||
$paramcount = $#{$args{'parameterlist'}}; # -1 is empty
|
||||
if ($paramcount >= 0) {
|
||||
print ".SH ARGUMENTS\n";
|
||||
}
|
||||
foreach $parameter (@{$args{'parameterlist'}}) {
|
||||
my $parameter_name = $parameter;
|
||||
$parameter_name =~ s/\[.*//;
|
||||
@@ -822,10 +827,16 @@ sub output_function_rst(%) {
|
||||
my $oldprefix = $lineprefix;
|
||||
|
||||
my $signature = "";
|
||||
if ($args{'functiontype'} ne "") {
|
||||
$signature = $args{'functiontype'} . " " . $args{'function'} . " (";
|
||||
} else {
|
||||
$signature = $args{'function'} . " (";
|
||||
my $func_macro = $args{'func_macro'};
|
||||
my $paramcount = $#{$args{'parameterlist'}}; # -1 is empty
|
||||
|
||||
if ($func_macro) {
|
||||
$signature = $args{'function'};
|
||||
} else {
|
||||
if ($args{'functiontype'}) {
|
||||
$signature = $args{'functiontype'} . " ";
|
||||
}
|
||||
$signature .= $args{'function'} . " (";
|
||||
}
|
||||
|
||||
my $count = 0;
|
||||
@@ -844,7 +855,9 @@ sub output_function_rst(%) {
|
||||
}
|
||||
}
|
||||
|
||||
$signature .= ")";
|
||||
if (!$func_macro) {
|
||||
$signature .= ")";
|
||||
}
|
||||
|
||||
if ($sphinx_major < 3) {
|
||||
if ($args{'typedef'}) {
|
||||
@@ -888,9 +901,11 @@ sub output_function_rst(%) {
|
||||
# Put our descriptive text into a container (thus an HTML <div>) to help
|
||||
# set the function prototypes apart.
|
||||
#
|
||||
print ".. container:: kernelindent\n\n";
|
||||
$lineprefix = " ";
|
||||
print $lineprefix . "**Parameters**\n\n";
|
||||
if ($paramcount >= 0) {
|
||||
print ".. container:: kernelindent\n\n";
|
||||
print $lineprefix . "**Parameters**\n\n";
|
||||
}
|
||||
foreach $parameter (@{$args{'parameterlist'}}) {
|
||||
my $parameter_name = $parameter;
|
||||
$parameter_name =~ s/\[.*//;
|
||||
@@ -1704,7 +1719,7 @@ sub check_return_section {
|
||||
sub dump_function($$) {
|
||||
my $prototype = shift;
|
||||
my $file = shift;
|
||||
my $noret = 0;
|
||||
my $func_macro = 0;
|
||||
|
||||
print_lineno($new_start_line);
|
||||
|
||||
@@ -1769,7 +1784,7 @@ sub dump_function($$) {
|
||||
# declaration_name and opening parenthesis (notice the \s+).
|
||||
$return_type = $1;
|
||||
$declaration_name = $2;
|
||||
$noret = 1;
|
||||
$func_macro = 1;
|
||||
} elsif ($prototype =~ m/^()($name)\s*$prototype_end/ ||
|
||||
$prototype =~ m/^($type1)\s+($name)\s*$prototype_end/ ||
|
||||
$prototype =~ m/^($type2+)\s*($name)\s*$prototype_end/) {
|
||||
@@ -1796,7 +1811,7 @@ sub dump_function($$) {
|
||||
# of warnings goes sufficiently down, the check is only performed in
|
||||
# -Wreturn mode.
|
||||
# TODO: always perform the check.
|
||||
if ($Wreturn && !$noret) {
|
||||
if ($Wreturn && !$func_macro) {
|
||||
check_return_section($file, $declaration_name, $return_type);
|
||||
}
|
||||
|
||||
@@ -1814,7 +1829,8 @@ sub dump_function($$) {
|
||||
'parametertypes' => \%parametertypes,
|
||||
'sectionlist' => \@sectionlist,
|
||||
'sections' => \%sections,
|
||||
'purpose' => $declaration_purpose
|
||||
'purpose' => $declaration_purpose,
|
||||
'func_macro' => $func_macro
|
||||
});
|
||||
} else {
|
||||
output_declaration($declaration_name,
|
||||
@@ -1827,7 +1843,8 @@ sub dump_function($$) {
|
||||
'parametertypes' => \%parametertypes,
|
||||
'sectionlist' => \@sectionlist,
|
||||
'sections' => \%sections,
|
||||
'purpose' => $declaration_purpose
|
||||
'purpose' => $declaration_purpose,
|
||||
'func_macro' => $func_macro
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -2322,7 +2339,6 @@ sub process_inline($$) {
|
||||
|
||||
sub process_file($) {
|
||||
my $file;
|
||||
my $initial_section_counter = $section_counter;
|
||||
my ($orig_file) = @_;
|
||||
|
||||
$file = map_filename($orig_file);
|
||||
@@ -2360,8 +2376,7 @@ sub process_file($) {
|
||||
}
|
||||
|
||||
# Make sure we got something interesting.
|
||||
if ($initial_section_counter == $section_counter && $
|
||||
output_mode ne "none") {
|
||||
if (!$section_counter && $output_mode ne "none") {
|
||||
if ($output_selection == OUTPUT_INCLUDE) {
|
||||
emit_warning("${file}:1", "'$_' not found\n")
|
||||
for keys %function_table;
|
||||
|
||||
Reference in New Issue
Block a user