Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 7 insertions, 3 deletions

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index a53e2fc8dfb5..d27aad78e1d8 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -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";
         }