From cd3891cba6326df5ecfe4067f80e86390c759303 Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Wed, 18 Mar 2009 16:19:33 -0400
Subject: Put man pages from tapset in 3stap (PR9870).

---
 scripts/kernel-doc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index add4ba3c..9947882d 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -981,7 +981,7 @@ sub output_probe_xml(%) {
     print "</refentryinfo>\n";
     print "<refmeta>\n";
     print " <refentrytitle><phrase>".$args{'probe'}."</phrase></refentrytitle>\n";
-    print " <manvolnum>5</manvolnum>\n";
+    print " <manvolnum>3stap</manvolnum>\n";
 #    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
     print "</refmeta>\n";
     print "<refnamediv>\n";
@@ -1039,7 +1039,7 @@ sub output_sfunction_xml(%) {
     print "</refentryinfo>\n";
     print "<refmeta>\n";
     print " <refentrytitle><phrase>".$args{'sfunction'}."</phrase></refentrytitle>\n";
-    print " <manvolnum>5</manvolnum>\n";
+    print " <manvolnum>3stap</manvolnum>\n";
 #    print " <refmiscinfo class=\"version\">" . $kernelversion . "</refmiscinfo>\n";
     print "</refmeta>\n";
     print "<refnamediv>\n";
-- 
cgit 


From d4db5608dbc31868a2041f20ea3f473eef3e61fd Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Mon, 23 Mar 2009 11:16:13 -0400
Subject: Add missing escape in kernel-doc create_sparameterlist() matching.

---
 scripts/kernel-doc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 9947882d..92178910 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1774,7 +1774,7 @@ sub create_sparameterlist($$$) {
     my $param;
 
     foreach my $arg (split($splitter, $args)) {
-	if ($arg =~ m/s*([\w]+)\s*:?\s*([\w]*)/) {
+	if ($arg =~ m/\s*([\w]+)\s*:?\s*([\w]*)/) {
 	    $param = $1;
 	    $type = $2;
 	    push_parameter($param, $type, $file);
-- 
cgit 


From 7d6c591292084444ada2ecdecafe59c730865451 Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Tue, 24 Mar 2009 13:03:54 -0400
Subject: Strip off "probe" for the probe documentation generation.

---
 scripts/kernel-doc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 92178910..7f2db03f 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -2083,7 +2083,7 @@ sub process_state3_probe($$) {
     my $prototype = shift;
     my $file = shift;
 
-    $prototype =~ s@/probe/@@o;	# strip off leading 'probe'
+    $prototype =~ s@probe@@o;	# strip off leading 'probe'
     $prototype =~ s@^\s+@@gos; # strip leading spaces
     dump_probe($prototype,$file);
     reset_state();
-- 
cgit