3.4-stable patches

added patches:
	kernel-doc-bugfix-multi-line-macros.patch

diff --git a/queue-3.4/kernel-doc-bugfix-multi-line-macros.patch b/queue-3.4/kernel-doc-bugfix-multi-line-macros.patch
new file mode 100644 (file)
index 0000000..e65685d
--- /dev/null
+++ b/queue-3.4/kernel-doc-bugfix-multi-line-macros.patch
@@ -0,0 +1,52 @@
+From 654784284430bf2739985914b65e09c7c35a7273 Mon Sep 17 00:00:00 2001
+From: Daniel Santos <daniel.santos@pobox.com>
+Date: Thu, 4 Oct 2012 17:15:05 -0700
+Subject: kernel-doc: bugfix - multi-line macros
+
+From: Daniel Santos <daniel.santos@pobox.com>
+
+commit 654784284430bf2739985914b65e09c7c35a7273 upstream.
+
+Prior to this patch the following code breaks:
+
+/**
+ * multiline_example - this breaks kernel-doc
+ */
+ #define multiline_example( \
+myparam)
+
+Producing this error:
+
+Error(somefile.h:983): cannot understand prototype: 'multiline_example( \ '
+
+This patch fixes the issue by appending all lines ending in a blackslash
+(optionally followed by whitespace), removing the backslash and any
+whitespace after it prior to appending (just like the C pre-processor
+would).
+
+This fixes a break in kerel-doc introduced by the additions to rbtree.h.
+
+Signed-off-by: Daniel Santos <daniel.santos@pobox.com>
+Cc: Randy Dunlap <rdunlap@xenotime.net>
+Cc: Michal Marek <mmarek@suse.cz>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ scripts/kernel-doc |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/scripts/kernel-doc
++++ b/scripts/kernel-doc
+@@ -2045,6 +2045,9 @@ sub process_file($) {
+ 
+     $section_counter = 0;
+     while (<IN>) {
++      while (s/\\\s*$//) {
++          $_ .= <IN>;
++      }
+       if ($state == 0) {
+           if (/$doc_start/o) {
+               $state = 1;             # next line is always the function name

diff --git a/queue-3.4/series b/queue-3.4/series
index e00db5ffcd8328031b8b28067f5254da6241de43..c6a411b28395ad7cadef7bd775ba1a3518e37008 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -19,3 +19,4 @@ perf-fix-perf_cgroup_switch-for-sw-events.patch
 fanotify-dont-merge-permission-events.patch
 perf-tools-handle-jited-code-in-shared-memory.patch
 sfc-Fix-efx_rx_buf_offset-for-recycled-pages-3.4.patch
+kernel-doc-bugfix-multi-line-macros.patch