rpms/kernel/F-9 linux-2.6-kernel-doc-structs-private.patch, NONE, 1.1 kernel.spec, 1.799, 1.800

[Roland McGrath]

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9877

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kernel-doc-structs-private.patch 
Log Message:
backport kerneldoc tools fix so utrace manual formats

linux-2.6-kernel-doc-structs-private.patch:

--- NEW FILE linux-2.6-kernel-doc-structs-private.patch ---
commit 39f00c087d31f668eb6eaf97508af22a32c5b1d9
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date:   Mon Sep 22 13:57:44 2008 -0700

    kernel-doc: allow structs whose members are all private
    
    Struct members may be marked as private by using
    	/* private: */
    before them, as noted in Documentation/kernel-doc-nano-HOWTO.txt
    
    Fix kernel-doc to handle structs whose members are all private;
    otherwise invalid XML is generated:
    
    xmlto: input does not validate (status 3)
    linux-2.6.27-rc6-git4/Documentation/DocBook/debugobjects.xml:146: element variablelist: validity error : Element variablelist content does not follow the DTD, expecting ((title , titleabbrev?)? , varlistentry+), got ()
    Document linux-2.6.27-rc6-git4/Documentation/DocBook/debugobjects.xml does not validate
    make[1]: *** [Documentation/DocBook/debugobjects.html] Error 3
    
    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
    Reported-by: Roland McGrath <roland at redhat.com>
    Cc: Roland McGrath <roland at redhat.com>
    Cc: Christoph Hellwig <hch at infradead.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 scripts/kernel-doc |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index ff787e6..44ee94d 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -781,6 +781,7 @@ sub output_struct_xml(%) {
     print " <refsect1>\n";
     print "  <title>Members</title>\n";
 
+    if ($#{$args{'parameterlist'}} >= 0) {
     print "  <variablelist>\n";
     foreach $parameter (@{$args{'parameterlist'}}) {
       ($parameter =~ /^#/) && next;
@@ -798,6 +799,9 @@ sub output_struct_xml(%) {
       print "    </varlistentry>\n";
     }
     print "  </variablelist>\n";
+    } else {
+	print " <para>\n  None\n </para>\n";
+    }
     print " </refsect1>\n";
 
     output_section_xml(@_);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -r1.799 -r1.800
--- kernel.spec	15 Oct 2008 05:20:02 -0000	1.799
+++ kernel.spec	15 Oct 2008 06:01:20 -0000	1.800
@@ -597,6 +597,7 @@
 Patch20: linux-2.6-ptrace-cleanup.patch
 Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
+Patch23: linux-2.6-kernel-doc-structs-private.patch
 
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-sched-clock-fix-nohz-interaction.patch
@@ -1081,6 +1082,7 @@
 ApplyPatch linux-2.6-ptrace-cleanup.patch
 ApplyPatch linux-2.6-tracehook.patch
 ApplyPatch linux-2.6-utrace.patch
+ApplyPatch linux-2.6-kernel-doc-structs-private.patch
 
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch