mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
Merge commit 'v2.6.28-rc7' into tracing/core
This commit is contained in:
commit
b8307db247
278 changed files with 5399 additions and 2538 deletions
|
|
@ -378,6 +378,10 @@ sub dump_section {
|
|||
# print STDERR "parameter def '$1' = '$contents'\n";
|
||||
$name = $1;
|
||||
$parameterdescs{$name} = $contents;
|
||||
} elsif ($name eq "@\.\.\.") {
|
||||
# print STDERR "parameter def '...' = '$contents'\n";
|
||||
$name = "...";
|
||||
$parameterdescs{$name} = $contents;
|
||||
} else {
|
||||
# print STDERR "other section '$name' = '$contents'\n";
|
||||
if (defined($sections{$name}) && ($sections{$name} ne "")) {
|
||||
|
|
@ -1588,12 +1592,12 @@ sub push_parameter($$$) {
|
|||
|
||||
if ($type eq "" && $param =~ /\.\.\.$/)
|
||||
{
|
||||
$type="";
|
||||
$parameterdescs{$param} = "variable arguments";
|
||||
if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") {
|
||||
$parameterdescs{$param} = "variable arguments";
|
||||
}
|
||||
}
|
||||
elsif ($type eq "" && ($param eq "" or $param eq "void"))
|
||||
{
|
||||
$type="";
|
||||
$param="void";
|
||||
$parameterdescs{void} = "no arguments";
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue