From e641917fed5919912651e50ba74f82e353024330 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 18 Nov 2010 12:27:31 -0800
Subject: [PATCH] --- yaml --- r: 222207 b: refs/heads/master c:
 2b35f4d9cab365d37c7b34ce51e1c1144c312d05 h: refs/heads/master i:   222205:
 25702ffeab7c1ca3266293c5586223730b61a486   222203:
 e2ff9112deb069f8fc5ce6c5af589317dd447683   222199:
 57823379cc7ad75b513aa38559bde9509df15141   222191:
 126e8aa2137edd37ef8507827e3a97427de9396e   222175:
 0cf310e4440dbe9a6bc19262f1fa9cb56a0a5179   222143:
 2aec1e2c6cb6ffe819c8c44309471c44b5cde50b   222079:
 980edf5163eb1dfa71809b7a2c15e4800b4016b4   221951:
 2e74198343e7cbc93f6d249a42447f872c84b2d8   221695:
 b5656fafc1b8fd2a08b51f138033a12144491414   221183:
 38fc39228d667d1b068c4364c02104ea78be4a94 v: v3

---
 [refs]                   |  2 +-
 trunk/scripts/kernel-doc | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f2d65ad9f538..3b7b03dc80c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2811036a19624168ff9342bb85421dbbb1d2ac0d
+refs/heads/master: 2b35f4d9cab365d37c7b34ce51e1c1144c312d05
diff --git a/trunk/scripts/kernel-doc b/trunk/scripts/kernel-doc
index cdb6dc1f6458..39580a5dc5df 100755
--- a/trunk/scripts/kernel-doc
+++ b/trunk/scripts/kernel-doc
@@ -5,7 +5,7 @@ use strict;
 ## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##
 ## Copyright (C) 2000, 1  Tim Waugh <twaugh@redhat.com>          ##
 ## Copyright (C) 2001  Simon Huggins                             ##
-## Copyright (C) 2005-2009  Randy Dunlap                         ##
+## Copyright (C) 2005-2010  Randy Dunlap                         ##
 ## 								 ##
 ## #define enhancements by Armin Kuster <akuster@mvista.com>	 ##
 ## Copyright (c) 2000 MontaVista Software, Inc.			 ##
@@ -453,7 +453,7 @@ sub output_highlight {
     if ($output_mode eq "html" || $output_mode eq "xml") {
 	$contents = local_unescape($contents);
 	# convert data read & converted thru xml_escape() into &xyz; format:
-	$contents =~ s/\\\\\\/&/g;
+	$contents =~ s/\\\\\\/\&/g;
     }
 #   print STDERR "contents b4:$contents\n";
     eval $dohighlight;
@@ -770,7 +770,11 @@ sub output_struct_xml(%) {
     print $args{'type'} . " " . $args{'struct'} . " {\n";
     foreach $parameter (@{$args{'parameterlist'}}) {
 	if ($parameter =~ /^#/) {
-	    print "$parameter\n";
+	    my $prm = $parameter;
+	    # convert data read & converted thru xml_escape() into &xyz; format:
+	    # This allows us to have #define macros interspersed in a struct.
+	    $prm =~ s/\\\\\\/\&/g;
+	    print "$prm\n";
 	    next;
 	}
 
@@ -1701,6 +1705,8 @@ sub push_parameter($$$) {
 	}
 	}
 
+	$param = xml_escape($param);
+
 	# strip spaces from $param so that it is one continous string
 	# on @parameterlist;
 	# this fixes a problem where check_sections() cannot find