[kernel] r19573 - in dists/trunk/linux/debian: . patches patches/bugfix/arm

[Maximilian Attems]

Author: maks
Date: Tue Dec  4 18:04:10 2012
New Revision: 19573

Log:
fix arm* builds

add relevant patch.
Thanks-to: Arnaud Patard <arnaud.patard at rtp-net.org>

Added:
   dists/trunk/linux/debian/patches/bugfix/arm/ARM-7492-1-add-strstr-declaration-for-decompressors.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Tue Dec  4 15:20:28 2012	(r19572)
+++ dists/trunk/linux/debian/changelog	Tue Dec  4 18:04:10 2012	(r19573)
@@ -7,6 +7,7 @@
   * Enable NETFILTER_XT_TARGET_HMARK, NET_EMATCH_IPSET, USB_NET_QMI_WWAN.
   * Enable more HID drivers.
   * [x86] Enable INTEL_MEI.
+  * [ARM]: 7492/1: add strstr declaration for decompressors.
 
   [ Ben Hutchings ]
   * HID: Add Apple wireless keyboard 2011 ANSI to special driver list

Added: dists/trunk/linux/debian/patches/bugfix/arm/ARM-7492-1-add-strstr-declaration-for-decompressors.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/arm/ARM-7492-1-add-strstr-declaration-for-decompressors.patch	Tue Dec  4 18:04:10 2012	(r19573)
@@ -0,0 +1,34 @@
+From ef1c2096fcf390f2f6a6a835d9d26105e82abda5 Mon Sep 17 00:00:00 2001
+From: Rob Herring <rob.herring at calxeda.com>
+Date: Wed, 15 Aug 2012 16:28:36 +0100
+Subject: [PATCH] ARM: 7492/1: add strstr declaration for decompressors
+
+With the generic unaligned.h, more kernel headers get pulled in including
+dynamic_debug.h which needs strstr. As it is not really used, we only need
+a declaration here.
+
+Signed-off-by: Rob Herring <rob.herring at calxeda.com>
+Tested-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
+Reviewed-by: Arnd Bergmann <arnd at arndb.de>
+Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+---
+ arch/arm/boot/compressed/decompress.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
+index f41b38c..9deb56a 100644
+--- a/arch/arm/boot/compressed/decompress.c
++++ b/arch/arm/boot/compressed/decompress.c
+@@ -32,6 +32,9 @@ extern void error(char *);
+ #  define Tracecv(c,x)
+ #endif
+ 
++/* Not needed, but used in some headers pulled in by decompressors */
++extern char * strstr(const char * s1, const char *s2);
++
+ #ifdef CONFIG_KERNEL_GZIP
+ #include "../../../../lib/decompress_inflate.c"
+ #endif
+-- 
+1.8.0
+

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Tue Dec  4 15:20:28 2012	(r19572)
+++ dists/trunk/linux/debian/patches/series	Tue Dec  4 18:04:10 2012	(r19573)
@@ -49,3 +49,4 @@
 debian/cirrus-disable-modeset-by-default.patch
 debian/fs-enable-link-security-restrictions-by-default.patch
 bugfix/all/hid-add-apple-wireless-keyboard-2011-ansi-to-special-driver-list.patch
+bugfix/arm/ARM-7492-1-add-strstr-declaration-for-decompressors.patch