[kernel] r22650 - in dists/trunk/linux/debian/patches: . bugfix/all

[Ben Hutchings]

Author: benh
Date: Tue May 12 19:36:40 2015
New Revision: 22650

Log:
linux-doc: parse kernel-doc deterministically

Added:
   dists/trunk/linux/debian/patches/bugfix/all/make-highlights-deterministic-in-kernel-doc.patch
Modified:
   dists/trunk/linux/debian/patches/series

Added: dists/trunk/linux/debian/patches/bugfix/all/make-highlights-deterministic-in-kernel-doc.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/all/make-highlights-deterministic-in-kernel-doc.patch	Tue May 12 19:36:40 2015	(r22650)
@@ -0,0 +1,23 @@
+From: Jérémy Bobbio <lunar at debian.org>
+Date: Wed, 7 Jan 2015 20:49:51 +0100
+Subject: parse kernel-doc deterministically
+
+Regular expressions for highlights in kernel-doc are stored in a Perl
+hash. These hashes are ordered differently for each Perl run. This will
+prevent kernel-doc to behave deterministically when parsing
+“@foo()” as in some runs it will be interpreted as a parameter and
+in the others it will be interpreted as a function.
+
+We now sort the %highlights hash to get the same behavior on every run.
+
+--- a/scripts/kernel-doc
++++ b/scripts/kernel-doc
+@@ -2587,7 +2587,7 @@ $kernelversion = get_kernel_version();
+ 
+ # generate a sequence of code that will splice in highlighting information
+ # using the s// operator.
+-foreach my $pattern (keys %highlights) {
++foreach my $pattern (sort keys %highlights) {
+ #   print STDERR "scanning pattern:$pattern, highlight:($highlights{$pattern})\n";
+     $dohighlight .=  "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n";
+ }

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Tue May 12 19:11:55 2015	(r22649)
+++ dists/trunk/linux/debian/patches/series	Tue May 12 19:36:40 2015	(r22650)
@@ -61,6 +61,7 @@
 bugfix/all/net-mv643xx-disable-tso-by-default.patch
 bugfix/all/vfs-read-file_handle-only-once-in-handle_to_path.patch
 debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch
+bugfix/all/make-highlights-deterministic-in-kernel-doc.patch
 
 # Miscellaneous features
 features/all/efi-autoload-efi-pstore.patch