Merge branch 'smp' into misc

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c

1 files changed, 9 insertions, 3 deletions

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index cdb6dc1f645..39580a5dc5d 100755
--- a/scripts/kernel-doc
+++ b/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