From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 26 Apr 2015 10:08:16 +0000 (+0200)
Subject: 3.10-stable patches
X-Git-Tag: v4.0.1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ec5fb4106e4af8cd13c7e782b0fc217642a526f;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	utf-8-q-kconfig-20fix-20warning-20-e2-80-98jump.patch
---

diff --git a/queue-3.10/series b/queue-3.10/series
index 805351c8939..32564565d61 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -22,3 +22,4 @@ bluetooth-add-support-for-intel-bootloader-devices.patch
 bluetooth-ignore-isochronous-endpoints-for-intel-usb-bootloader.patch
 netfilter-conntrack-disable-generic-tracking-for-known-protocols.patch
 kvm-x86-sysenter-emulation-is-broken.patch
+utf-8-q-kconfig-20fix-20warning-20-e2-80-98jump.patch
diff --git a/queue-3.10/utf-8-q-kconfig-20fix-20warning-20-e2-80-98jump.patch b/queue-3.10/utf-8-q-kconfig-20fix-20warning-20-e2-80-98jump.patch
new file mode 100644
index 00000000000..47e6c819712
--- /dev/null
+++ b/queue-3.10/utf-8-q-kconfig-20fix-20warning-20-e2-80-98jump.patch
@@ -0,0 +1,52 @@
+From 2d560306096739e2251329ab5c16059311a151b0 Mon Sep 17 00:00:00 2001
+From: Peter Kümmel <syntheticpp@gmx.net>
+Date: Tue, 4 Nov 2014 12:01:59 +0100
+Subject: =?UTF-8?q?kconfig:=20Fix=20warning=20"=E2=80=98jump?=
+ =?UTF-8?q?=E2=80=99=20may=20be=20used=20uninitialized"?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Peter Kümmel <syntheticpp@gmx.net>
+
+commit 2d560306096739e2251329ab5c16059311a151b0 upstream.
+
+Warning:
+In file included from scripts/kconfig/zconf.tab.c:2537:0:
+scripts/kconfig/menu.c: In function ‘get_symbol_str’:
+scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized]
+     jump->offset = strlen(r->s);
+
+Simplifies the test logic because (head && local) means (jump != 0)
+and makes GCC happy when checking if the jump pointer was initialized.
+
+Signed-off-by: Peter Kümmel <syntheticpp@gmx.net>
+Signed-off-by: Michal Marek <mmarek@suse.cz>
+[ dileks: v2: Backported to fit v3.10 ]
+Cc: Sedat Dilek <sedat.dilek@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+
+ scripts/kconfig/menu.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/scripts/kconfig/menu.c
++++ b/scripts/kconfig/menu.c
+@@ -525,7 +525,7 @@ static void get_prompt_str(struct gstr *
+ {
+ 	int i, j;
+ 	struct menu *submenu[8], *menu, *location = NULL;
+-	struct jump_key *jump;
++	struct jump_key *jump = NULL;
+ 
+ 	str_printf(r, _("Prompt: %s\n"), _(prop->text));
+ 	menu = prop->menu->parent;
+@@ -563,7 +563,7 @@ static void get_prompt_str(struct gstr *
+ 		str_printf(r, _("  Location:\n"));
+ 		for (j = 4; --i >= 0; j += 2) {
+ 			menu = submenu[i];
+-			if (head && location && menu == location)
++			if (jump && menu == location)
+ 				jump->offset = r->len - 1;
+ 			str_printf(r, "%*c-> %s", j, ' ',
+ 				   _(menu_get_prompt(menu)));