From patchwork Fri May 5 19:46:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98654 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292611qge; Fri, 5 May 2017 12:48:06 -0700 (PDT) X-Received: by 10.98.202.149 with SMTP id y21mr18827493pfk.225.1494013686303; Fri, 05 May 2017 12:48:06 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.06; Fri, 05 May 2017 12:48:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751271AbdEETsF (ORCPT + 6 others); Fri, 5 May 2017 15:48:05 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:64512 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750751AbdEETsE (ORCPT ); Fri, 5 May 2017 15:48:04 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MTsu0-1dX5kC1HLE-00QSA1; Fri, 05 May 2017 21:47:56 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Oliver O'Halloran , Anton Blanchard , Benjamin Herrenschmidt , Paul Mackerras , Mel Gorman , Andrew Morton , Linus Torvalds , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 01/87] mm/init: fix zone boundary creation Date: Fri, 5 May 2017 21:46:19 +0200 Message-Id: <20170505194745.3627137-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:EJ8tvVEiu+ASHIkxZD7ZSgmlQ4d3a7QLHgPf5WEhNZX/dw4tUUC lx2GYkQlgdEWZo20kH2Uz5YBkkmxjKDs1/kOEm8pRz2r6IMo9ahMLCdEPXny3eYtoalEm0v FjOik9/IarXbgPHtldi4KukIZsn0agV1qTaD96k75KweHur9d8sXVX8yn2S7tg7mUAXKRuU p6WrojzDaDNqfjzUffH4w== X-UI-Out-Filterresults: notjunk:1; V01:K0:VPR1U2sNWMA=:zaR541hG4ZdowyS1E3wcN5 duyHov9fMY1vtbRakaCZefAEtiJ8y5qlqrGO+BspDMkS+OIeHt/0kxLqj9Q/yQZzua5zK+w0x LKQUQAMfMSG0X7zVmyl71x3BaJykUCi63TtnLsiF6riv4mCpgSHfcn8idkysiyMFHAEjP+n3e FNoEC45KniFoo6kj6qmqLBnT5dS0kp9fn5n+nvtt1yyG/nKfbtUn1kFxZgBgnH/9S8z0nn/WQ ccSQH/8S+pwmz4RayDwLaA5QPiOI3nbIN3m0FxVC+E3ob1fBK9i9LPo1kJhBWrVKxcMB9C9sk yAdyMFNxQxWozidc02ZR/T58SJ7e40+brjZPp6+BzVxI7iJLSC+bak78z6mIoXLTdLyS2WbdU 6gorTf0g7d6XBYMo0loIN1cbbe8nmxaQvOSsHArJCQbFM4PTrfcPHHARsfEJmI4wF8a5WGpGN 3aSI+LJ+I6kczzSA78d06aylciXqNXgifk1A8z6ypNbuRmDYwY0kVj+/AWghPKpWxvsv5PedY DFeKO22EcTZWdl20xC2B+pe1sWGOcMvGps8F2i5OvCK9kAtAKbcdLjDJQmooB0zmzRvYgszbV ruV0tcvQQBECNejB2Q/0+T6qrTqWj17faJFYP3J52LkQlhOLjNGQTFqINgajYrCxgWmvhaBp7 dEvz3PiFuzlFfH/jSgjxoJHA5vA8FO3j9A/BJ3BWhvr6E/xFW+WVI9P077OPq/eL8Om8= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Oliver O'Halloran commit 90cae1fe1c3540f791d5b8e025985fa5e699b2bb upstream. As a part of memory initialisation the architecture passes an array to free_area_init_nodes() which specifies the max PFN of each memory zone. This array is not necessarily monotonic (due to unused zones) so this array is parsed to build monotonic lists of the min and max PFN for each zone. ZONE_MOVABLE is special cased here as its limits are managed by the mm subsystem rather than the architecture. Unfortunately, this special casing is broken when ZONE_MOVABLE is the not the last zone in the zone list. The core of the issue is: if (i == ZONE_MOVABLE) continue; arch_zone_lowest_possible_pfn[i] = arch_zone_highest_possible_pfn[i-1]; As ZONE_MOVABLE is skipped the lowest_possible_pfn of the next zone will be set to zero. This patch fixes this bug by adding explicitly tracking where the next zone should start rather than relying on the contents arch_zone_highest_possible_pfn[]. Thie is low priority. To get bitten by this you need to enable a zone that appears after ZONE_MOVABLE in the zone_type enum. As far as I can tell this means running a kernel with ZONE_DEVICE or ZONE_CMA enabled, so I can't see this affecting too many people. I only noticed this because I've been fiddling with ZONE_DEVICE on powerpc and 4.6 broke my test kernel. This bug, in conjunction with the changes in Taku Izumi's kernelcore=mirror patch (d91749c1dda71) and powerpc being the odd architecture which initialises max_zone_pfn[] to ~0ul instead of 0 caused all of system memory to be placed into ZONE_DEVICE at boot, followed a panic since device memory cannot be used for kernel allocations. I've already submitted a patch to fix the powerpc specific bits, but I figured this should be fixed too. Link: http://lkml.kernel.org/r/1462435033-15601-1-git-send-email-oohall@gmail.com Signed-off-by: Oliver O'Halloran Cc: Anton Blanchard Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- mm/page_alloc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) -- 2.9.0 diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9ddea0200c94..7415fb62fa9d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5319,15 +5319,18 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn) sizeof(arch_zone_lowest_possible_pfn)); memset(arch_zone_highest_possible_pfn, 0, sizeof(arch_zone_highest_possible_pfn)); - arch_zone_lowest_possible_pfn[0] = find_min_pfn_with_active_regions(); - arch_zone_highest_possible_pfn[0] = max_zone_pfn[0]; - for (i = 1; i < MAX_NR_ZONES; i++) { + + start_pfn = find_min_pfn_with_active_regions(); + + for (i = 0; i < MAX_NR_ZONES; i++) { if (i == ZONE_MOVABLE) continue; - arch_zone_lowest_possible_pfn[i] = - arch_zone_highest_possible_pfn[i-1]; - arch_zone_highest_possible_pfn[i] = - max(max_zone_pfn[i], arch_zone_lowest_possible_pfn[i]); + + end_pfn = max(max_zone_pfn[i], start_pfn); + arch_zone_lowest_possible_pfn[i] = start_pfn; + arch_zone_highest_possible_pfn[i] = end_pfn; + + start_pfn = end_pfn; } arch_zone_lowest_possible_pfn[ZONE_MOVABLE] = 0; arch_zone_highest_possible_pfn[ZONE_MOVABLE] = 0; From patchwork Fri May 5 19:46:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98653 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292579qge; Fri, 5 May 2017 12:48:01 -0700 (PDT) X-Received: by 10.98.14.13 with SMTP id w13mr12904465pfi.59.1494013681336; Fri, 05 May 2017 12:48:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.01; Fri, 05 May 2017 12:48:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751209AbdEETsA (ORCPT + 6 others); Fri, 5 May 2017 15:48:00 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:50304 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750751AbdEETsA (ORCPT ); Fri, 5 May 2017 15:48:00 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MVEDt-1dYSG12eKL-00YPqa; Fri, 05 May 2017 21:47:56 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Linus Torvalds , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 02/87] Disable "frame-address" warning Date: Fri, 5 May 2017 21:46:20 +0200 Message-Id: <20170505194745.3627137-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:B6kb/mEKi7lHoqeGHoaMQKhjv6AJfCSNQ4vuYv5hP/DD4hXihLu mFqySRCPQJCHGv3MI87VNedUR4QPZUrsnjee1Pi1peL3/T2LefvM4LjzfCMwUhJV4hoQzS6 RRQMjMThBN8zKUifwkb8VO2C066G3yj7Vh0ocBnryVrEFdlu+AzYHdP4vvvC2dmzUQVaCEy IRSZEuTYfkwETiAWsMUQQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:0JxE4ltSolk=:hamAGef1p0TtQrK3Kg6AC7 HsPTnQritMDDiXxxn6ZRXU/dGHEh03WZXyjE+WhqD5lnZoRlBBNJ/CoWrUfVdlU1SWy+Xa/yt 4YMWvMRHDA4bxTSGrsc+zw/Ocyuy0ZyaLBjrjbYsQTV15N5vOcNNbyXzxoHiySxcsFM64aVC3 OWpiSbNuE7VpsdtupFmV62sLFTn7DmULLTQpymwcNMRz3n8FnBGNkpMjfDAaZC4fC7cIPv5vO /N38iPmW3/rpXo6ct/jVmHuoiNHOahG6ydNCgEevjQ6caRZKTDmq4xURe4zLjLjzN0+wi710C 4NpJxOjv70rAxJlQo69UWthZpGLVOo+aOF8jgDvgk+RNDbpaDX3XlOULM8sNltfmS11Gumzvu eR0lXM8cHwD70pZmZh8iG99iAZ/D/v478tXxY51dU808JWH8PteD7Fj2/wEQNWb1rSK5y+lxg WY7EQfdGEly/UBpAbxzAsI4rZqeRbuENFV/C3uxuuNs4kyTqpgBZnAHYSyHYfozt0wMLtgCWG jeGmT6Q5uYmMRQ2lWoXRIdvPoNNoZCqyHLoBVht8sTaPagkMHjE5c1rWBzdwOMKHJGyAuoRrc 6CYxgFNgo6owRWgdl2ZpUW5IExVgMk1F1nwqeCyJSNSGJGIjt/7hXdfyJca2MM5zFjAwihp+u //Jt5ShyTDCAF1E3TPMI8eO+u6OHb+8wo3LRbhUQ239U+KfsvcdSyHA8vpco6IDsBExhknCsg Gh3qnUHzunDAko5x Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Torvalds commit 124a3d88fa20e1869fc229d7d8c740cc81944264 upstream. Newer versions of gcc warn about the use of __builtin_return_address() with a non-zero argument when "-Wall" is specified: kernel/trace/trace_irqsoff.c: In function ‘stop_critical_timings’: kernel/trace/trace_irqsoff.c:433:86: warning: calling ‘__builtin_return_address’ with a nonzero argument is unsafe [-Wframe-address] stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); [ .. repeats a few times for other similar cases .. ] It is true that a non-zero argument is somewhat dangerous, and we do not actually have very many uses of that in the kernel - but the ftrace code does use it, and as Stephen Rostedt says: "We are well aware of the danger of using __builtin_return_address() of > 0. In fact that's part of the reason for having the "thunk" code in x86 (See arch/x86/entry/thunk_{64,32}.S). [..] it adds extra frames when tracking irqs off sections, to prevent __builtin_return_address() from accessing bad areas. In fact the thunk_32.S states: 'Trampoline to trace irqs off. (otherwise CALLER_ADDR1 might crash)'." For now, __builtin_return_address() with a non-zero argument is the best we can do, and the warning is not helpful and can end up making people miss other warnings for real problems. So disable the frame-address warning on compilers that need it. Acked-by: Steven Rostedt Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- Makefile | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/Makefile b/Makefile index 28b1d5eed2c5..c3aa051dea75 100644 --- a/Makefile +++ b/Makefile @@ -616,6 +616,7 @@ all: vmlinux include $(srctree)/arch/$(SRCARCH)/Makefile KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) +KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) From patchwork Fri May 5 19:46:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98659 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292663qge; Fri, 5 May 2017 12:48:15 -0700 (PDT) X-Received: by 10.99.163.18 with SMTP id s18mr5269309pge.150.1494013695583; Fri, 05 May 2017 12:48:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013695; cv=none; d=google.com; s=arc-20160816; b=IffSObncQX7sO0dFzc5zSW7Rh+sHoo4GE6t15mKGPgbDpl+2tSW7Darg6Nw/Y9fY2i sc5U+trinf73iekGkYhVg45M/ftgu9CJfJwMHrGPN8Xss1uB9nJXM2tbrbggN3WATAYM KqR246hh6YDrzxmLxlspk3IxAzXt9slWUM0xXNnWsRd4FsNfKb/YTE4vGaeX6g18KFdC U29Zw5tE4VuQcABrA0HetpIMPGur4+TMxibLnF35CkAeT09ah52TCnn3p5VTWkkdfwM0 Xs80MU4DObRFXz4TdV8xS1EG4xPuuhTluT0vO3L+W2yq97g0PjvsdoK3Qbq/3UqHHFXl 6Emg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=U6aIf0h9rEaRtgQIh/A0nJJHkufXJEnU9U5oHNxUCoY=; b=cdshcgASkeYS+aqSlupmXWDVwcTjzzHb9bysvDGPyha8LqUd5oaap8+S+xNWw67y9r tizsRQG96Kwz6n1TEHsJx/o1G1zjm8GUtXAyOlWYbBVbcBVf2kTFRuo4rZOYSb7H7va8 CQq7hvCHwxBMkeKYIvtX30ZVMLRsg+mbRRLLQtLh+Cm+5lzVHLMqeA4pUHzZdtU0W7ka QbodobV5eGwpEvBQz0cpNa0y96L58nTj3Jrpic4sXwwaVZOrdY+pXj3qoDGb86TBTwN0 ymLV9ojfqVlPZuDZ3wWLgCVOW3O/rsdrtsoMYz+6QnWjMvNPp8yJf1B42PVm4TDl9BjN +3kw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.15; Fri, 05 May 2017 12:48:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755345AbdEETsO (ORCPT + 6 others); Fri, 5 May 2017 15:48:14 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:64780 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752456AbdEETsK (ORCPT ); Fri, 5 May 2017 15:48:10 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LvcQG-1e7EqP1sPU-017TY9; Fri, 05 May 2017 21:47:57 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Paul Gortmaker , Rusty Russell , Arnd Bergmann Subject: [PATCH 3.16-stable 03/87] modpost: expand pattern matching to support substring matches Date: Fri, 5 May 2017 21:46:21 +0200 Message-Id: <20170505194745.3627137-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:E/cxWvfe33VeEwGb8M6mbABUbC9jpxt15njYwkAbWtvvYgvnZxa uAwEoKWm9ntstIk9hvQoKQMJkRUR+yv0iC8p9SfdJXugMqy9HzXBcEoJVCb2JR/qjY37rNF YHKv366eOYy2ksZVC8wk3jCy/cgMjYcljStAky1F085i36GYGEYC9Se0qKBqikmLZ7ffhMY Ev+CHEFTlvYdEzp2WorsQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:2AR00kRXhC0=:wOpmKQwKFbqpthIr6ACoVf xZyh665KW6FnsoEJq7nzRtJ6UZPyEtVI4Cl1T5hWqc24IesjDHZRbpdwe0XsLXGD9BBa5MzUk M6oX0weIlEXGmsMgmLDXeHPjTxCd8SUQ6sD6JYc+oJWxxo6vhqu+iSZVloaHLw/XhhcZSH6ij Vj1QFGzy4wB7vEt60gmPecvwULv1Tl9465JvCUf/zoCAHAunCD4MOH3Lknml4QiYJoS6VA4Y+ 9DeMV2OunNWskL3WOFLg0HwQ0MksC36jzqLTGnRuAbVtvtAVUtar69AZKsDd7B8bwgOfud/1/ A3V+fVEST7NxbyfE5npvVFJ1kziZ7q1uBnC1SKybbRI9Qluh88aOQ2BSxcisGJ2c8u1bnhwdw QRIx4fTCe94RvH5F33/mWlExL6C4OrYhW/W0oKbIgiQ2c//wW6feZ9GDNA6PzseQ0lnOA+BF4 EmOHIg82HSHN4U194Dn/A1MN2WVKzjKaJAaoKZRDV9Vy+ooVYNRirnaOYYbc8PpbBPeooPOzu yBdqOSYDXICeF2UdiyBgXkWYqXLQUhnxQFTZJ+lpEVL0hENWMdUeZtgrAl/CzbF3DcgFZZfVB pn2pz002TJ4N7xSlaZJwtqVng/aexyR+QbC8EIfoVrB8aERAme05vVLxFhbItug0CAvJTmcZA HXpHBDb9ZhSkBXRbkJug8Jg8f/T7q8X0dAMarRslTgP39pjoCSYeGIyCSwd94WZ1uvVI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Gortmaker Commit 09c20c032b0f753969ae778d9783d946f054d7fe upstream. Currently the match() function supports a leading * to match any prefix and a trailing * to match any suffix. However there currently is not a combination of both that can be used to target matches of whole families of functions that share a common substring. Here we expand the *foo and foo* match to also support *foo* with the goal of targeting compiler generated symbol names that contain strings like ".constprop." and ".isra." Signed-off-by: Paul Gortmaker Signed-off-by: Rusty Russell Signed-off-by: Arnd Bergmann --- scripts/mod/modpost.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 9d9c5b905b35..14e3f53ebf17 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -798,6 +798,7 @@ static int number_prefix(const char *sym) * where the '1' can be any number including several digits. * The $ syntax is for sections where ld append a dot number * to make section name unique. + * "*foo*" will match a string that contains "foo" */ static int match(const char *sym, const char * const pat[]) { @@ -806,8 +807,17 @@ static int match(const char *sym, const char * const pat[]) p = *pat++; const char *endp = p + strlen(p) - 1; + /* "*foo*" */ + if (*p == '*' && *endp == '*') { + char *here, *bare = strndup(p + 1, strlen(p) - 2); + + here = strstr(sym, bare); + free(bare); + if (here != NULL) + return 1; + } /* "*foo" */ - if (*p == '*') { + else if (*p == '*') { if (strrcmp(sym, p + 1) == 0) return 1; } From patchwork Fri May 5 19:46:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98657 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292652qge; Fri, 5 May 2017 12:48:13 -0700 (PDT) X-Received: by 10.99.97.6 with SMTP id v6mr5391704pgb.186.1494013693828; Fri, 05 May 2017 12:48:13 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.13; Fri, 05 May 2017 12:48:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752658AbdEETsM (ORCPT + 6 others); Fri, 5 May 2017 15:48:12 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:54100 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751653AbdEETsK (ORCPT ); Fri, 5 May 2017 15:48:10 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MdTH9-1dP58Y2x5n-00IRos; Fri, 05 May 2017 21:47:57 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Paul Gortmaker , Rusty Russell , Arnd Bergmann Subject: [PATCH 3.16-stable 04/87] modpost: don't emit section mismatch warnings for compiler optimizations Date: Fri, 5 May 2017 21:46:22 +0200 Message-Id: <20170505194745.3627137-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:i7HIfSQp6AB7Qfqf6IFezB5f503y74OtGGRG94p6GPg8Tkwk6xU LGwXonRnL42UzUOIkJM3QNyxDB0Ur8nmDBIgwQyy/4ZSdwQWpQ20MmUjUCh6w6A4UEzJcAz aNpFeLbrA58knKtR4pp3OwLidtrMdSJYG3A9jEeVUOZ69d/Dh1T+WYDeLM4sBf95ZKmcFyd m3dhzRpdkXeLtMv0Ij7zA== X-UI-Out-Filterresults: notjunk:1; V01:K0:IYVqkHRkD5o=:pEJW7iD1lC/jF4SuYxwhPa qIhRZRaNdS5WHHNaTbLYkOf0GOMMlRWOwxXD7WGKKTue67oWZeG8bJTWpIr3LzGCM6hX4Gt25 KcD0DBBr0ZdGAfYEUvS0vfbav/zDE3MAFsYsdFaQEdDAg7FDnEaqr+nhQy+GavA3wusVK4p3J /7PdYpcuqKjw2InyBU+6/ce+Z2gEK9q4VQCdYfmBd8M9phqSaipGDDGPd5XxxnvEEegIrREJy V5/8fwdU0qK+QzOGnKEDRDCqRVtdhr6427nAvKPH+gUmNhKaQ8lCCUfbh3pvXhSA+Ogtvca+4 b3zOfFfcMEyjssGqRf5LxJHRqUIpJEAYNoNsTXn5KDrU5CcJwxd2p31lNdLbyV6Fa3GzL0TZ7 qhL6mSgTQAoWOV26MRZLBtM0AaNmQTXUkGVLBYYDqWQL7w85Me7aGne9YVmpBY6Ya/dEmAdSl 2gE+rGmhQEytDaJsrjdJs7TPQKv4cyMu6f4CwyblBtLE61KIme10RjaQlzzyCxh2SCqK1D0ZA tFA5Y74yknQAuD62WnIyhF+FHOF0cYy7wtf658nuriHFR/3TPKyyzjAcpLi+gpoWcnwXJ1kpA Kl8Da9b/LREYzclHU6InvAMRD83Hu1MniKBXG8qeFr2TeB4mdnDmu7X6AQIKkcqH+yprlWfd7 N7bkp1r15V3mxFdDIkfOC9fXd6Y5q2AUhWYV6Zb0jSv/CSX7MsOuItVdaMJrQWZMBhJk= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Gortmaker Commit 4a3893d069b788f3570c19c12d9e986e8e15870f upstream. Currently an allyesconfig build [gcc-4.9.1] can generate the following: WARNING: vmlinux.o(.text.unlikely+0x3864): Section mismatch in reference from the function cpumask_empty.constprop.3() to the variable .init.data:nmi_ipi_mask which comes from the cpumask_empty usage in arch/x86/kernel/nmi_selftest.c. Normally we would not see a symbol entry for cpumask_empty since it is: static inline bool cpumask_empty(const struct cpumask *srcp) however in this case, the variant of the symbol gets emitted when GCC does constant propagation optimization. Fix things up so that any locally optimized constprop variants don't warn when accessing variables that live in the __init sections. [arnd: adapted text_sections definition to 3.18] Signed-off-by: Paul Gortmaker Signed-off-by: Rusty Russell Signed-off-by: Arnd Bergmann --- scripts/mod/modpost.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.9.0 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 14e3f53ebf17..2241d036b63a 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -930,6 +930,10 @@ static const char *init_sections[] = { ALL_INIT_SECTIONS, NULL }; static const char *init_exit_sections[] = {ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL }; +/* all text sections */ +static const char *const text_sections[] = { ALL_INIT_TEXT_SECTIONS, + ALL_EXIT_TEXT_SECTIONS, TEXT_SECTIONS, NULL }; + /* data section */ static const char *data_sections[] = { DATA_SECTIONS, NULL }; @@ -948,6 +952,7 @@ static const char *data_sections[] = { DATA_SECTIONS, NULL }; static const char *head_sections[] = { ".head.text*", NULL }; static const char *linker_symbols[] = { "__init_begin", "_sinittext", "_einittext", NULL }; +static const char *const optim_symbols[] = { "*.constprop.*", NULL }; enum mismatch { TEXT_TO_ANY_INIT, @@ -1105,6 +1110,17 @@ static const struct sectioncheck *section_mismatch( * This pattern is identified by * refsymname = __init_begin, _sinittext, _einittext * + * Pattern 5: + * GCC may optimize static inlines when fed constant arg(s) resulting + * in functions like cpumask_empty() -- generating an associated symbol + * cpumask_empty.constprop.3 that appears in the audit. If the const that + * is passed in comes from __init, like say nmi_ipi_mask, we get a + * meaningless section warning. May need to add isra symbols too... + * This pattern is identified by + * tosec = init section + * fromsec = text section + * refsymname = *.constprop.* + * **/ static int secref_whitelist(const struct sectioncheck *mismatch, const char *fromsec, const char *fromsym, @@ -1137,6 +1153,12 @@ static int secref_whitelist(const struct sectioncheck *mismatch, if (match(tosym, linker_symbols)) return 0; + /* Check for pattern 5 */ + if (match(fromsec, text_sections) && + match(tosec, init_sections) && + match(fromsym, optim_symbols)) + return 0; + return 1; } From patchwork Fri May 5 19:46:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98739 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp392151obb; Fri, 5 May 2017 12:52:47 -0700 (PDT) X-Received: by 10.98.201.197 with SMTP id l66mr11144662pfk.249.1494013795013; Fri, 05 May 2017 12:49:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si2689373pgp.198.2017.05.05.12.49.54; Fri, 05 May 2017 12:49:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754341AbdEETto (ORCPT + 6 others); Fri, 5 May 2017 15:49:44 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:58943 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756060AbdEETtl (ORCPT ); Fri, 5 May 2017 15:49:41 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lc3CH-1dnnFc2KE1-00jdAe; Fri, 05 May 2017 21:48:01 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Andrey Ryabinin , Dmitry Vyukov , Konstantin Serebryany , Dmitry Chernenkov , Andrey Konovalov , Yuri Gribov , Konstantin Khlebnikov , Sasha Levin , Christoph Lameter , Joonsoo Kim , Dave Hansen , Andi Kleen , Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Pekka Enberg , David Rientjes , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 05/87] module: fix types of device tables aliases Date: Fri, 5 May 2017 21:46:23 +0200 Message-Id: <20170505194745.3627137-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:H84WldReHPBoBYRNr5BWq6NnjGpZtTewXDCic8kMnzIJEr51wUM 9LwjHRYvHCW+Gvq2cbbK7lpcboKchJR/972hlTS9O/j9Apxc/j62vrMLBNAkeffkjpFxZ3y okO3SyonS5Dwp99sQR7/W4VdG0mispluOdF1xkh4dls9G1OOW0mFIQgt5RnQfoq3ypwiOU/ fWtiGSiqnJLujh/j8QqwA== X-UI-Out-Filterresults: notjunk:1; V01:K0:t30vJNQofeI=:QhXjLaOd4Y5mDWo5hzr03L lisvjy3rR4YIX5H4pWDWHslROLkpnULU+k+iC2mP5OMmrW8w7H+eo17qP1l1IZwE4wFHSFCzA MIYuXAUeOdmPgasRDn59UtFprVxMYF4qhmxHmJ7MgRc7XXppqpW8aGf0JyaoppHuFNjYj0jTy a6T29jDCaMyKRw1qI0/GHjDwJzRTIjuLzhhHSE4lF86HFGc6o9Huf9KkQo+OmL/gReuA9AZWv wqgItgnlDRTgw+dfu7p0ZmLs0a7riASjSUCSRedRyMFwqM6em1UF9sjKEVDTtDTQvz4QduEML B6b0UolxBD/t2TS7iFe6YmxCF7fMDFfY7QgItlklsq9dPVKY1FF5eYgzTt0Cqrefhf5aOQo6y b7alIz+wg/Fi+Q/VbQzZHVZv8CWv7e3pYz1d2tnkukOAemRuy0A+9wxIm4Vn+xgtsuMJ9+99+ Lf/Iohwnki0TUdUy4ABm7GWjWEbJKmSf4jnlZnZsXYvkpoFnBy0SDMqjXBxyHyk2RgiiSmgaY YjaICZZTrGHYYO8kZK68UWL4zhg81wAHb4f8MGwustXENbHseJ5sw2F1gAhI2JyOkzDTiAHrX TaDQmMuzit3/5MmR7+USJh7HOrpFjvPLTkF58UJGPCSoAgOGIkAuzTbu3fjYXzXxVKSF5r1Ba 1kFoS+tv3vOmoWksd2zkBncBI+0mT7t6tB23J712c/NLkxMKi0NX9oIp4Ne8PVfRK4SE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrey Ryabinin commit 6301939d97d079f0d3dbe71e750f4daf5d39fc33 upstream. MODULE_DEVICE_TABLE() macro used to create aliases to device tables. Normally alias should have the same type as aliased symbol. Device tables are arrays, so they have 'struct type##_device_id[x]' types. Alias created by MODULE_DEVICE_TABLE() will have non-array type - 'struct type##_device_id'. This inconsistency confuses compiler, it could make a wrong assumption about variable's size which leads KASan to produce a false positive report about out of bounds access. For every global variable compiler calls __asan_register_globals() passing information about global variable (address, size, size with redzone, name ...) __asan_register_globals() poison symbols redzone to detect possible out of bounds accesses. When symbol has an alias __asan_register_globals() will be called as for symbol so for alias. Compiler determines size of variable by size of variable's type. Alias and symbol have the same address, so if alias have the wrong size part of memory that actually belongs to the symbol could be poisoned as redzone of alias symbol. By fixing type of alias symbol we will fix size of it, so __asan_register_globals() will not poison valid memory. Signed-off-by: Andrey Ryabinin Cc: Dmitry Vyukov Cc: Konstantin Serebryany Cc: Dmitry Chernenkov Signed-off-by: Andrey Konovalov Cc: Yuri Gribov Cc: Konstantin Khlebnikov Cc: Sasha Levin Cc: Christoph Lameter Cc: Joonsoo Kim Cc: Dave Hansen Cc: Andi Kleen Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Christoph Lameter Cc: Pekka Enberg Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- include/linux/module.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/include/linux/module.h b/include/linux/module.h index f520a767c86c..ac1e65afc5a1 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -135,7 +135,7 @@ void trim_init_extable(struct module *m); #ifdef MODULE /* Creates an alias so file2alias.c can find device table. */ #define MODULE_DEVICE_TABLE(type, name) \ - extern const struct type##_device_id __mod_##type##__##name##_device_table \ +extern const typeof(name) __mod_##type##__##name##_device_table \ __attribute__ ((unused, alias(__stringify(name)))) #else /* !MODULE */ #define MODULE_DEVICE_TABLE(type, name) From patchwork Fri May 5 19:46:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98683 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292766qge; Fri, 5 May 2017 12:48:31 -0700 (PDT) X-Received: by 10.98.86.207 with SMTP id h76mr3660602pfj.205.1494013711215; Fri, 05 May 2017 12:48:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.30; Fri, 05 May 2017 12:48:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754324AbdEETs3 (ORCPT + 6 others); Fri, 5 May 2017 15:48:29 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:53915 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbdEETsZ (ORCPT ); Fri, 5 May 2017 15:48:25 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LbUhX-1dnFou0PU3-00lIOc; Fri, 05 May 2017 21:48:03 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Andrew Morton , James Bottomley , Andrey Ryabinin , David Miller , Hans Verkuil , Linus Torvalds , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 06/87] MODULE_DEVICE_TABLE: fix some callsites Date: Fri, 5 May 2017 21:46:24 +0200 Message-Id: <20170505194745.3627137-7-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:uShPyOJB+xc586g2ldA5j0qR/Fyh6mfOwpSEUspfL6svhBj6mpp ThuTm/t9ZzhA1wP1Ko4RHK2dUQ4UUOgtX1FIGQXQ8waOW55tHPwWPR0PiudSTEHbPzsHvGt 0JbfWjj5BwI9WZP3MtJk4ZFxfB3WV9wlsvk/D9lGbLOlWpWvyYJTX3/NKd2OFfgoa+MTd7o 2tvJBZYs+Zzt09bR4yS+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:2ryop9g6pC4=:8LEcAbVo7IPQuLC5UFHTPZ BNt/xE6OkIcqyZwCADVfTmza7joYkhHzobrq8Hv7DYPAJwiH5wgcPydByI0JiHXharla0TVzD +2hAcYtswysbN+d6NDtgITX4c2RwyFsR+BX6OcvkEYLOsH5RRmkIx1fGmjdfaLxK/A/qKGWSM juyfZ5iLuTjjRAF/IawLRHGYuceUYdsM8K+hL6nVEZKtXfMeKoqKo5ROr3s9UD/ebEIpDv0t0 UEkcPcRfjR7IRRgCdE1i3/J9gDfU0lOwy85Qq9MYf2Y3+NpJVBcN8zF9xC+0oGZxHOaRdDvc/ EUnjfL7fwcJNSNTMiOvNnKJQ96CwT5sHR2G/2N+uRWYdNiQJbUXdYQo1KSkl5NyNOp4fo7hz4 fAILFPsvxbnr/2g5xGB5XsjtDmZ1XS0xe/LOem45Z5lk+8TIo/daUL7AIXUlrP1Jlp/GAwYIK CHKQ/Px8ip9WuTJL287WMR4TGAC/CvMFhIVZJYnp/cZQ4s/2bty0ba469CXsV5KmpsY3ok+oH I2YSCcpb6G+jxrLfAIdyFQ8sKN00B/Cf0nlB6VArOq235qpAeHIuDeXxKefKXCIcrmYaXN33o eOXsZwfpjUwv2fmqJswnEdiwEMlBZ7axjVaFol5UkzS+wXuLwtrr1oawBs1tCTP1LSxVWS1oT tObY2TU2T0AbuHPNB4zpi8SxFpUXFejfjtzbVcfs6K24g6q6hFnaMzhoJeFTAGf5VZT0= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrew Morton commit 0f989f749b51ec1fd94bb5a42f8ad10c8b9f73cb upstream. The patch "module: fix types of device tables aliases" newly requires that invocations of MODULE_DEVICE_TABLE(type, name); come *after* the definition of `name'. That is reasonable, but some drivers weren't doing this. Fix them. Cc: James Bottomley Cc: Andrey Ryabinin Cc: David Miller Cc: Hans Verkuil Acked-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- Documentation/video4linux/v4l2-pci-skeleton.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 1 - drivers/scsi/be2iscsi/be_main.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) -- 2.9.0 diff --git a/Documentation/video4linux/v4l2-pci-skeleton.c b/Documentation/video4linux/v4l2-pci-skeleton.c index 46904fe49609..8c3d3d625c6c 100644 --- a/Documentation/video4linux/v4l2-pci-skeleton.c +++ b/Documentation/video4linux/v4l2-pci-skeleton.c @@ -42,7 +42,6 @@ MODULE_DESCRIPTION("V4L2 PCI Skeleton Driver"); MODULE_AUTHOR("Hans Verkuil"); MODULE_LICENSE("GPL v2"); -MODULE_DEVICE_TABLE(pci, skeleton_pci_tbl); /** * struct skeleton - All internal data for one instance of device @@ -95,6 +94,7 @@ static const struct pci_device_id skeleton_pci_tbl[] = { /* { PCI_DEVICE(PCI_VENDOR_ID_, PCI_DEVICE_ID_) }, */ { 0, } }; +MODULE_DEVICE_TABLE(pci, skeleton_pci_tbl); /* * HDTV: this structure has the capabilities of the HDTV receiver. diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 1e187fb760f8..7329ab75afb5 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -26,7 +26,6 @@ #include MODULE_VERSION(DRV_VER); -MODULE_DEVICE_TABLE(pci, be_dev_ids); MODULE_DESCRIPTION(DRV_DESC " " DRV_VER); MODULE_AUTHOR("Emulex Corporation"); MODULE_LICENSE("GPL"); diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 803fd64d0966..1075b7001e4a 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -48,7 +48,6 @@ static unsigned int be_iopoll_budget = 10; static unsigned int be_max_phys_size = 64; static unsigned int enable_msix = 1; -MODULE_DEVICE_TABLE(pci, beiscsi_pci_id_table); MODULE_DESCRIPTION(DRV_DESC " " BUILD_STR); MODULE_VERSION(BUILD_STR); MODULE_AUTHOR("Emulex Corporation"); From patchwork Fri May 5 19:46:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98726 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293460qge; Fri, 5 May 2017 12:50:10 -0700 (PDT) X-Received: by 10.98.86.207 with SMTP id h76mr3660830pfj.205.1494013714471; Fri, 05 May 2017 12:48:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.34; Fri, 05 May 2017 12:48:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755603AbdEETsd (ORCPT + 6 others); Fri, 5 May 2017 15:48:33 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:61369 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755521AbdEETsU (ORCPT ); Fri, 5 May 2017 15:48:20 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M6rkj-1e0s7v1cwv-00wi3U; Fri, 05 May 2017 21:48:06 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Gerald Schaefer , "Kirill A . Shutemov" , Vlastimil Babka , Mike Kravetz , "Aneesh Kumar K . V" , Martin Schwidefsky , Heiko Carstens , Rui Teng , Dave Hansen , Andrew Morton , Linus Torvalds , Arnd Bergmann Subject: [PATCH 3.16-stable 07/87] mm/hugetlb: improve locking in dissolve_free_huge_pages() Date: Fri, 5 May 2017 21:46:25 +0200 Message-Id: <20170505194745.3627137-8-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:BL9NbL8yI42SPn/qi5ykWQigrMO2xymwRaMF6FA2TSYy78EcOW0 CsMaJhq+d+la02m22GNOjEL18MpKCdbpJizD/j8E2MulpPuRVLNAsYutlZ4ZMXTVd04PE9e bHlGxJyovEf02HZ6X/EiJqstSruT130SFl08y0Oqt4kvo5KF4rD4Jhrb4HF45D0DsT2Judv gCXhfkz9z27qCw28ILPjg== X-UI-Out-Filterresults: notjunk:1; V01:K0:4XN2uK/urxs=:FaEAzdD0h0j+n8FSYmtQqP IkiSFPOhBLrUxS7OvQIyZj87gkcyjFufoAFLV3ygxmMHSnUEelUAC0PhCS85hzCZi1G5xivMe r0CvCiIIq0+uXZ21M6BcGg64NoQAFz6ZHtsEYkasEE7KeHJiiwzkfexjahNajelPp9m8bFv0p WoGf0TaeNftNiMwGxRBkzjMDnwYqEcfyH6sXlWjALJaAI5eMD3WgmqKG/9vFDhn6i9AcPyEA+ 4pW2wX4oh39Ewp/mIwDcI8MtP2rZ8x4QM6tuSWNjpwCWwUSg67oEPVETRtPJKf/7r8DLGP0kX xxmkRSUBmCtknYvHNU6F8IEQEvAcWr/1fcnQXXq1wsnF8sA7IZrtGcDs+QuTsjZLnPZacR5qW YCsvw7IwSimVDtUMXQSrD2TmmdUYIfBrjNDqZAU2XoytC4vOOdyykaej6ND6Lv7m+nw3UY1GK TCfmU2DNvy6vQj0iUWuNrjJtCsnm1lNJhYTRBdHjUcpuDlVsB4oM5VgW/GYvq2WXV/SYS90AS CEw1luf+k6AbKkAKMuP5FDi2zsl5+YuLKvLmvEolD8KDs/Gok9Gb34jcUFTLNk7caaqJor3oU WDYXb0Ego6WBHB9r8otFnjeubKrLYDlR+IG7DdxY4HFBQCLkjItqq//tOQKUBoy+MxiEjv1P4 FIXTgNDcEqqA7LD2fPm/c7ZTHoBxtg4iqulM0pMWBhTugu2xH/KJ4cWeUAWT8PPzn0FE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gerald Schaefer Commit 7b21d5b87b550c5cdaca73bd37c976cc1ab85398 upstream. For every pfn aligned to minimum_order, dissolve_free_huge_pages() will call dissolve_free_huge_page() which takes the hugetlb spinlock, even if the page is not huge at all or a hugepage that is in-use. Improve this by doing the PageHuge() and page_count() checks already in dissolve_free_huge_pages() before calling dissolve_free_huge_page(). In dissolve_free_huge_page(), when holding the spinlock, those checks need to be revalidated. Link: http://lkml.kernel.org/r/20160926172811.94033-4-gerald.schaefer@de.ibm.com Signed-off-by: Gerald Schaefer Acked-by: Michal Hocko Acked-by: Naoya Horiguchi Cc: "Kirill A . Shutemov" Cc: Vlastimil Babka Cc: Mike Kravetz Cc: "Aneesh Kumar K . V" Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Rui Teng Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Arnd Bergmann --- mm/hugetlb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 467d04b62948..c892a6b51e8e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1105,14 +1105,20 @@ out: int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn) { unsigned long pfn; + struct page *page; int rc = 0; if (!hugepages_supported()) return rc; - for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << minimum_order) - if (rc = dissolve_free_huge_page(pfn_to_page(pfn))) - break; + for (pfn = start_pfn; pfn < end_pfn; pfn += 1 << minimum_order) { + page = pfn_to_page(pfn); + if (PageHuge(page) && !page_count(page)) { + rc = dissolve_free_huge_page(page); + if (rc) + break; + } + } return rc; } From patchwork Fri May 5 19:46:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98676 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292740qge; Fri, 5 May 2017 12:48:27 -0700 (PDT) X-Received: by 10.98.75.6 with SMTP id y6mr12273505pfa.157.1494013707853; Fri, 05 May 2017 12:48:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013707; cv=none; d=google.com; s=arc-20160816; b=iDrvNO1G1YGiCDHcsTiaJevKe7YK0zXxrHjk04eBsxE5v72zO7we+f1Mi0KQJG9z5T OyqiE9LxELJQipM62wfbyIqR2kZJE1LzlT9ZYmVB/0xkmNmOQPP3Ni97LMJcXnNlmn0h fygjmzErOjzzGozRt2rGR4ToS64O5MwY536PYWB1dj69eVHfFur5C7OPcd5VJkzAL/pj uguAe9CKdUKji6iQm4gAsZvnzn6NIM0XyIK0D/8sS+oJRuV0KBKUZxPtLm1rCXErnZ8c yLnTEx4Xm1xIdQn0bUVDLhwIBHcRmLFedt8wsfTmSEvRfyJ1pfqeIp6ogHQXrznORUmU O+rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=cROrFUYhqoLti1CGtx6njl34q75B1Z+iblvv2ZqYCj0=; b=IhT4Y9Y79z52REMIMUr2ZlhEE0wG+NMVaYYRNrypu/ZjmJqnAkiixuz+YV0ob2459y 1p1GJ04DompdpsciNq0TR+If74Ww631K+YE0AyiYRlNDEGZ1XrtzeSt22cjbm3nsAmiN fTOFb2XR6XfNRgoOhOq9uP+8BkVrWHJqHPImYfJt5RoTMr/a384AE+vff8QM8iqlNSJ+ NuLXg6Neh4mEtYh79e7Al3w6mCtukBZBWoHgXKuycMTe9KZABl5UC1Pnn7ltY5q/6Emd ZqXOh2rZQR8qLTJHAL8GQOH26bzGgVMWwkpNqT9FQIiWyMzdRug/54aTb/m6+rCWEJtu H90g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.27; Fri, 05 May 2017 12:48:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751529AbdEETs0 (ORCPT + 6 others); Fri, 5 May 2017 15:48:26 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:61510 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755427AbdEETsP (ORCPT ); Fri, 5 May 2017 15:48:15 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MNyfL-1d9k8z2xwp-007Vby; Fri, 05 May 2017 21:48:06 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Rusty Russell , Arnd Bergmann Subject: [PATCH 3.16-stable 08/87] cpumask_set_cpu_local_first => cpumask_local_spread, lament Date: Fri, 5 May 2017 21:46:26 +0200 Message-Id: <20170505194745.3627137-9-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:+BrylGxQtJBiTvLTDVCFA9DW3ZOHtx6I8j+Dy3AfEwo8xP+he/T m4oS2q/Jq+l4vIEKulGWCOsPjzV1XTknopFbI+1QrpgJdqkvJRAEgSNTr+TBAm3I9k8O4vx CrqSLU1cW5R3NijJwGN/XL3bnraQQ9Py12PGaMMdJ+aMZlxuNil5iNDCFqhQGDrG01qcPNs VC4rsRBqoXu8TA9w1BzBw== X-UI-Out-Filterresults: notjunk:1; V01:K0:gihr+IDaejw=:fuJRGAQBGhIsXv68L6qzgA Tf3FJHb3v3ZY6EdbwHXYGaujZWpCls/D2wPCxM7lue0m451QCSY812euN6QLBPkpvr/+QApsa SPwrWrJTKR3Vb7bw+qdYi1ljjtsFdcGFXFmP/OpSW2Xd/hSj0WNQlMgF5sBY5pJG0ZRgjQIbo LVCTHY7jOOh6WswDTWxAhKcDht2Q2CGUXFcU/Vuskb0E+ifHNyxh06mjszQZyTXi7WdC4Ah5k O0uHS7mtxQoCHnnkkS4TzWNzh0PXF+7IMZylgcUzr+kAbGXDL1cLseKG4zaBgJuXll0qNQ9R9 QkyKU6LK42Ucul1hqJkID5PFa4nFn781kj7lGGRaOviVkidUvOhSgHBfiKcdS/THRO4x+tT4w 2NWBR0QF2E9sdj65rweh9qch0EmVDl3WOYgDfP4iL5JgSwnxVJrtE4m/dAdal+U8UghQDt+cv 0PqgeiGD5jEhIvb4vCIf65gaY8+mnptFbayE3279g7Xq7aIjN2Cob9kpnb1pf3ZKGNSOHgyKO zZKwP8OI+bTgsYXXuOnl809y0yh6DcSwaeV1/P01LYOhcetOkL8XQy6IvmgmC+9axKlQF1/qN aCLnrqhPU7FX+cPzM2RE1bTkkOVlUbKMcdQPVIE/5H8vu9DM6NxtxM5t+PbJq2+zfojQpPILo tEtFjAWereVjTCE2jMXwPQQQC9SIPDZZ5TVYPLCt2pdv8ZsWhiocOwGEOMrstwtI4irg= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rusty Russell Commit f36963c9d3f6f415732710da3acdd8608a9fa0e upstream. da91309e0a7e (cpumask: Utility function to set n'th cpu...) created a genuinely weird function. I never saw it before, it went through DaveM. (He only does this to make us other maintainers feel better about our own mistakes.) cpumask_set_cpu_local_first's purpose is say "I need to spread things across N online cpus, choose the ones on this numa node first"; you call it in a loop. It can fail. One of the two callers ignores this, the other aborts and fails the device open. It can fail in two ways: allocating the off-stack cpumask, or through a convoluted codepath which AFAICT can only occur if cpu_online_mask changes. Which shouldn't happen, because if cpu_online_mask can change while you call this, it could return a now-offline cpu anyway. It contains a nonsensical test "!cpumask_of_node(numa_node)". This was drawn to my attention by Geert, who said this causes a warning on Sparc. It sets a single bit in a cpumask instead of returning a cpu number, because that's what the callers want. It could be made more efficient by passing the previous cpu rather than an index, but that would be more invasive to the callers. Fixes: da91309e0a7e8966d916a74cce42ed170fde06bf Signed-off-by: Rusty Russell (then rebased) Tested-by: Amir Vadai Acked-by: Amir Vadai Acked-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 10 ++-- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 6 +-- include/linux/cpumask.h | 6 +-- lib/cpumask.c | 74 +++++++++----------------- 4 files changed, 34 insertions(+), 62 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 6bf4ea400643..f9056192e81c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -1535,17 +1535,13 @@ static int mlx4_en_init_affinity_hint(struct mlx4_en_priv *priv, int ring_idx) { struct mlx4_en_rx_ring *ring = priv->rx_ring[ring_idx]; int numa_node = priv->mdev->dev->numa_node; - int ret = 0; if (!zalloc_cpumask_var(&ring->affinity_mask, GFP_KERNEL)) return -ENOMEM; - ret = cpumask_set_cpu_local_first(ring_idx, numa_node, - ring->affinity_mask); - if (ret) - free_cpumask_var(ring->affinity_mask); - - return ret; + cpumask_set_cpu(cpumask_local_spread(ring_idx, numa_node), + ring->affinity_mask); + return 0; } static void mlx4_en_free_affinity_hint(struct mlx4_en_priv *priv, int ring_idx) diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index c5be6d890e94..a3d86e31f34c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -133,9 +133,9 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, ring->queue_index = queue_index; if (queue_index < priv->num_tx_rings_p_up) - cpumask_set_cpu_local_first(queue_index, - priv->mdev->dev->numa_node, - &ring->affinity_mask); + cpumask_set_cpu(cpumask_local_spread(queue_index, + priv->mdev->dev->numa_node), + &ring->affinity_mask); *pring = ring; return 0; diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 2997af6d2ccd..f7a172e31aec 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -142,10 +142,8 @@ static inline unsigned int cpumask_any_but(const struct cpumask *mask, return 1; } -static inline int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp) +static inline unsigned int cpumask_local_spread(unsigned int i, int node) { - set_bit(0, cpumask_bits(dstp)); - return 0; } @@ -199,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp) int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *); int cpumask_any_but(const struct cpumask *mask, unsigned int cpu); -int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp); +unsigned int cpumask_local_spread(unsigned int i, int node); /** * for_each_cpu - iterate over every cpu in a mask diff --git a/lib/cpumask.c b/lib/cpumask.c index b6513a9f2892..c0bd0df01e3d 100644 --- a/lib/cpumask.c +++ b/lib/cpumask.c @@ -166,64 +166,42 @@ void __init free_bootmem_cpumask_var(cpumask_var_t mask) #endif /** - * cpumask_set_cpu_local_first - set i'th cpu with local numa cpu's first - * + * cpumask_local_spread - select the i'th cpu with local numa cpu's first * @i: index number - * @numa_node: local numa_node - * @dstp: cpumask with the relevant cpu bit set according to the policy + * @node: local numa_node * - * This function sets the cpumask according to a numa aware policy. - * cpumask could be used as an affinity hint for the IRQ related to a - * queue. When the policy is to spread queues across cores - local cores - * first. + * This function selects an online CPU according to a numa aware policy; + * local cpus are returned first, followed by non-local ones, then it + * wraps around. * - * Returns 0 on success, -ENOMEM for no memory, and -EAGAIN when failed to set - * the cpu bit and need to re-call the function. + * It's not very efficient, but useful for setup. */ -int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp) +unsigned int cpumask_local_spread(unsigned int i, int node) { - cpumask_var_t mask; int cpu; - int ret = 0; - - if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) - return -ENOMEM; + /* Wrap: we always want a cpu. */ i %= num_online_cpus(); - if (numa_node == -1 || !cpumask_of_node(numa_node)) { - /* Use all online cpu's for non numa aware system */ - cpumask_copy(mask, cpu_online_mask); + if (node == -1) { + for_each_cpu(cpu, cpu_online_mask) + if (i-- == 0) + return cpu; } else { - int n; - - cpumask_and(mask, - cpumask_of_node(numa_node), cpu_online_mask); - - n = cpumask_weight(mask); - if (i >= n) { - i -= n; - - /* If index > number of local cpu's, mask out local - * cpu's - */ - cpumask_andnot(mask, cpu_online_mask, mask); + /* NUMA first. */ + for_each_cpu_and(cpu, cpumask_of_node(node), cpu_online_mask) + if (i-- == 0) + return cpu; + + for_each_cpu(cpu, cpu_online_mask) { + /* Skip NUMA nodes, done above. */ + if (cpumask_test_cpu(cpu, cpumask_of_node(node))) + continue; + + if (i-- == 0) + return cpu; } } - - for_each_cpu(cpu, mask) { - if (--i < 0) - goto out; - } - - ret = -EAGAIN; - -out: - free_cpumask_var(mask); - - if (!ret) - cpumask_set_cpu(cpu, dstp); - - return ret; + BUG(); } -EXPORT_SYMBOL(cpumask_set_cpu_local_first); +EXPORT_SYMBOL(cpumask_local_spread); From patchwork Fri May 5 19:46:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98666 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292686qge; Fri, 5 May 2017 12:48:19 -0700 (PDT) X-Received: by 10.99.142.73 with SMTP id k70mr5378949pge.0.1494013699728; Fri, 05 May 2017 12:48:19 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.19; Fri, 05 May 2017 12:48:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755211AbdEETsS (ORCPT + 6 others); Fri, 5 May 2017 15:48:18 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:63269 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755366AbdEETsP (ORCPT ); Fri, 5 May 2017 15:48:15 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0ME6mN-1dHTMu2qdD-00HREA; Fri, 05 May 2017 21:48:07 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Bob Peterson , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 09/87] gfs2: avoid uninitialized variable warning Date: Fri, 5 May 2017 21:46:27 +0200 Message-Id: <20170505194745.3627137-10-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:VUoV0dfUX0REY31euvinTkx08FpxAi1krbQ5jk/ETGXTCzQGe6m agmGUELa8ge5JYLEKOL/gXmh6BczZwImpcKbKzagH/E/k9xYBFN7ZPjGAjr6kwHeSl0gAof vToZ0KetAb8jWS3b5JVsaVCq4ZBqbyzUHFQbnOG04qsoUFI8zZ5SPD1IHXS0OICRtIVrllj R6BwqSR5qlCDOlGTIU/5w== X-UI-Out-Filterresults: notjunk:1; V01:K0:XWu/hMbbjPQ=:RvAzbOlWXypCZRnjHgFBeW /jOOMG3fkdBJvsvzUBC8senLlQhipRQliQms8SC4PXcrQXnd7ilMomYYB6/MlmX1Z9nyKP4/r EX+PabS3tKs5fFptqfENF6Ls0zoO8wi40DhpwQX1N0YTand8q6QmlvXxufIQaMzrQFkz7s5kI fLOGsU338vYaQXhvla632uqTlbPh/mU0huRcGZwxksud4tlgEZ/qOjSOUptHQhJR+6FxY4+gl RqmeRtKUC9UluPK66kbxD2YPO/0l+n3+O1ZWjB1mxm9BYLsYrB8LXHriqvRe2jPqMsRzcWjK4 Th6iNH3ZACnM9XB8+krUO0rBP958XjHJzvXQg8dZNeZewN0pzPJ2DRKvFwqiHlVTe2zhzQs3V qN307cegkrD75mR7Um8gS2CiV2cOwkU+F8MSTXLwWLhCSajjv+sxTOeKntppJma3HBOhDVzq7 aD76SEt7uN0FWtn7RmHPwJbogQe6yIVJ4AHgNCFDzwDLn9NU99rfYxIWXXhbTjt0zR3ykAG7J wLhCOyRoakH4eoKcLnUEt4yaTQBwQLg6NUVvqitgoMYOFiY66BIEF6PVvFuyZ3phR9cKJUJe5 sYQDm815SxLPIlFRQxqk8iQDMSTEvujPeDZqgEDiOquF3dWaY530dxoMA3q8OcIaGILOelbFN mfsNODOYroP/9b62XvPUATGNbY9AxDw5C9Vvrap/L8Ucy5vZN9LGc+W4d11aFU3MlynM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 67893f12e5374bbcaaffbc6e570acbc2714ea884 upstream. We get a bogus warning about a potential uninitialized variable use in gfs2, because the compiler does not figure out that we never use the leaf number if get_leaf_nr() returns an error: fs/gfs2/dir.c: In function 'get_first_leaf': fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] fs/gfs2/dir.c: In function 'dir_split_leaf': fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] Changing the 'if (!error)' to 'if (!IS_ERR_VALUE(error))' is sufficient to let gcc understand that this is exactly the same condition as in IS_ERR() so it can optimize the code path enough to understand it. Signed-off-by: Arnd Bergmann Signed-off-by: Bob Peterson Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- fs/gfs2/dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 5d4261ff5d23..9291cf5e7439 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -764,7 +764,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index, int error; error = get_leaf_nr(dip, index, &leaf_no); - if (!error) + if (!IS_ERR_VALUE(error)) error = get_leaf(dip, leaf_no, bh_out); return error; @@ -980,7 +980,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) index = name->hash >> (32 - dip->i_depth); error = get_leaf_nr(dip, index, &leaf_no); - if (error) + if (IS_ERR_VALUE(error)) return error; /* Get the old leaf block */ From patchwork Fri May 5 19:46:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98655 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292642qge; Fri, 5 May 2017 12:48:12 -0700 (PDT) X-Received: by 10.99.177.8 with SMTP id r8mr5304985pgf.109.1494013692249; Fri, 05 May 2017 12:48:12 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.12; Fri, 05 May 2017 12:48:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752923AbdEETsL (ORCPT + 6 others); Fri, 5 May 2017 15:48:11 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:53962 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbdEETsK (ORCPT ); Fri, 5 May 2017 15:48:10 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MPMdk-1dB6v93jhA-004TLJ; Fri, 05 May 2017 21:48:07 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 10/87] gfs2: remove IS_ERR_VALUE abuse Date: Fri, 5 May 2017 21:46:28 +0200 Message-Id: <20170505194745.3627137-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:Kk1im/aF0SXeJ6YCiatb5JuFbkYzRN5hp3ojizKPP5ZpzBdF4Dh vl/HvDKbP5wYWbXLq3a6gnjxIuzO1oBJeTPGyl7ussrYGPAfskke9ip+xfzmkbNK/2NyTdG wAkg4ymuOuWn6fj7CODKK8LAwNuUR2NG3NzwZ30Wtf+5/Q+UpIAybh7mYJsWKveI3sDYW/x Oeefd76zZmLdRgdURNvZA== X-UI-Out-Filterresults: notjunk:1; V01:K0:HQUHkeiYD9o=:ClnUTMZAOnK7rmpp/QL9fG aMNOXNNgjnq/SUTJFnGjXNWcGz8Tb0bRSE49uOEDNkaJT1u3YwKV/APxFxPB+wXMnGBOlHA7s 9wa7g8zBCHKu50ylVhzDnOnSzktEBxnbmZoB/AOHhTHeZ0w0xrpHvwnZaiqrXRcw9QLcxaOEV +MP4guKvHlooqapomMemibShz7T4IkW0aQlkWhecG69tEZJIy1j30k0M3e+8K1UwvHM/Iibfa 2Qg8jLPQ/rBfeTQ6RSoiP6U5MJ+X1f9OZP9T9g8OloK0i1hn/wxj5kwQG4PZtnwM7y/6JBeC4 W6xMqkhSIM1PkM4xkbKms730jftaN9bpOmibkV08jNy9BcrtKXCcjEwuFqAdhm3kn88my1ayn KfcQgsp2VmmC9Ys7bAtJefDOQwUd1lbG1CzgZEjQzExoASvBxvgb6pvPGZtzmCTOb6+Nm4T1e n15cik/ZZgdnbsGwhXBdLRjBzklq/zZ6dhULWi3+gF604ED6ETuME+9kJ6UO6LOtAkXsOii1q 6ZdqLuI9hWF5rz8YziSJrOEsScQe6RAJN8yW7AtOV042UQbhzdKm7wUCLXMA66Yw5udJ4MC4e zWgsV0r0khE4HZ5mVCuzlpy8ZREPmqfijOlaXCju3yv+aYtQXIWgkTFP0LiVn7Ou/hoJm98Jr KBMIy4MvHhFDV0p1Z5SYG9+2sK038P6OfXl/S1gxuWOj6dFucbHXp+Wov7yGSKtQ+exM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Picked from commit 287980e49ffc0f6d911601e7e352a812ed27768e ("remove lots of IS_ERR_VALUE abuses") upstream. The original fix that was backported to 3.18 already addressed the warning in some configurations, but not in others, leaving us with the same output: ../fs/gfs2/dir.c: In function 'get_first_leaf': ../fs/gfs2/dir.c:768:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] error = get_leaf(dip, leaf_no, bh_out); ^ ../fs/gfs2/dir.c: In function 'dir_split_leaf.isra.20': ../fs/gfs2/dir.c:987:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized] This takes the approach that we took in later versions in mainline, but does not backport the entire patch, as that would be too large for stable and IIRC caused regressions in other drivers. Fixes: 9d46d31e9aea ("gfs2: avoid uninitialized variable warning") Signed-off-by: Arnd Bergmann --- fs/gfs2/dir.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 9291cf5e7439..6810c8772eb1 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -749,12 +749,15 @@ static int get_leaf_nr(struct gfs2_inode *dip, u32 index, u64 *leaf_out) { __be64 *hash; + int error; hash = gfs2_dir_get_hash_table(dip); - if (IS_ERR(hash)) - return PTR_ERR(hash); - *leaf_out = be64_to_cpu(*(hash + index)); - return 0; + error = PTR_ERR_OR_ZERO(hash); + + if (!error) + *leaf_out = be64_to_cpu(*(hash + index)); + + return error; } static int get_first_leaf(struct gfs2_inode *dip, u32 index, From patchwork Fri May 5 19:46:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98656 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292648qge; Fri, 5 May 2017 12:48:13 -0700 (PDT) X-Received: by 10.84.228.201 with SMTP id y9mr37404063pli.13.1494013693162; Fri, 05 May 2017 12:48:13 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.12; Fri, 05 May 2017 12:48:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754806AbdEETsL (ORCPT + 6 others); Fri, 5 May 2017 15:48:11 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:62977 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751529AbdEETsK (ORCPT ); Fri, 5 May 2017 15:48:10 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LyeIB-1eAFmZ0MND-0165yU; Fri, 05 May 2017 21:48:08 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 11/87] iio: fix printk format string warning Date: Fri, 5 May 2017 21:46:29 +0200 Message-Id: <20170505194745.3627137-12-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:eLJ/Zsb/fEX/5uHBhVz5LHpS3Ly0BD+B+qhmfflauuaWZuzdav8 5TtBds7CEKWtPlI9ZBZyAY78uQBf6m883h/xghGU+wQKDd5Hhj4HLhK+UE6tCnutchLv9s6 rRht4EUdTxffcs1Lo7fx8KW0BC05TkzUcOS2S8E346dWGF35LD1EjU91mgft/pxIbEMwR3T a79OAghWdNro8heRV7JkQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:4hTa9sVYOu8=:qVJoxTTXrzlwRu9cDZ4lXs AMw7lTfxeR0WecwWXky8WM4rECGbpAUfJOzMQkUJi/XiDlggE1GIaxLduiC867wIaycQSiW1Q xagdsm03kFSQJP3b6RCaywlBT6p57ow5VqOanWKSkZA7+n2UKTGT7FiAt14ok1pZiNitSlVhz FhRHk1Cp87x5jYX/dF/rZryfm4wKPLtCm/jIpq03EgISMSkFhvPFyzVjFCU0Q2M3I/mFBDDT5 5WNqA5sbgfxnPteyeZzOW/KViCOuXEMju81MZ3AsjCCQyhApOtlMAX+fiREq8FABbKLkCcTV/ kIaWuYzYBmq03/GKES3k7WOzliq7zW+C1sCGDgdaoDoEW4L51Ip8q+ca/Yno37e1y9OP0CKwt 32/gkl9vm7SB9XY8bLIPfVgopwlWpmcGIRaS5oPdZvlhx+GoBl1+K7C6Gy/W1FbJGZ9TFaQDF yAYQT20jEwWk1+l5VQFMMmLeWazIjZKGFMafMVcM5ACd3WJpupsxeDhTYKygnGV1JIZ6/wEvq H7AFtsTWSAAV6ojNUaVmZ1o2eSSwidio7X3A/gsUoOIwX8fIHEV9eJdlwSszeXAHbhOaxarnH h7g7OyQnCJFOdbuRq9eK6QxjV51efbCJpOauygjUyujALVU7c4nfwfbDC8hwvmUUI5a5viFWM sVx/QhGAzR7B7F6jsgnNLpFdSbmF36ZqabnKDXwQ3QNY3FMCMeEQgBqSkr2t087hOHFA= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 3.16, we get this warning: drivers/iio/industrialio-core.c: In function 'iio_format_value': drivers/iio/industrialio-core.c:408:30: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long int' [-Werror=format=] Upstream commit 8f57e4d930d4 ("include/linux/kernel.h: change abs() macro so it uses consistent return type") addressed this in a more verbose way, but here we can simply add a type cast to shut up the warning. Signed-off-by: Arnd Bergmann --- drivers/iio/industrialio-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 230cbdda6ce1..669c27d93049 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -405,7 +405,7 @@ ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals) case IIO_VAL_FRACTIONAL: tmp = div_s64((s64)vals[0] * 1000000000LL, vals[1]); vals[0] = (int)div_s64_rem(tmp, 1000000000, &vals[1]); - return sprintf(buf, "%d.%09u\n", vals[0], abs(vals[1])); + return sprintf(buf, "%d.%09ld\n", vals[0], abs(vals[1])); case IIO_VAL_FRACTIONAL_LOG2: tmp = (s64)vals[0] * 1000000000LL >> vals[1]; vals[1] = do_div(tmp, 1000000000LL); From patchwork Fri May 5 19:46:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98658 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292656qge; Fri, 5 May 2017 12:48:14 -0700 (PDT) X-Received: by 10.84.241.132 with SMTP id b4mr2040391pll.107.1494013694382; Fri, 05 May 2017 12:48:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013694; cv=none; d=google.com; s=arc-20160816; b=xwe59IaUBtC9JsmMl+NK7+T0uEwWZjPek8AwAuJCbAq313PFfcocj6BO/zaOmcBfvz DT7Im4O5mEDqzT+tcjCFecPAP3ncgC9PvhdOwXt3w2c+yBLKGR2F4S5ZNWpNhu30933C pdwVNIA1CG+rOE9cPLnAbWySsGF3okcz2pasMFLhCEFipzmxT5o0bjCSSd1WKWELDPpw OeC3mKPc70ZgXJJK0X1B0ZGlEC+bKmbs3qnBVXjDxyveH2evs+To73G9gZ121dJsMn7s dXc84AUm0jjDQKLCQ15pSn05/cqx1kFIkwSBzVkRZSsLm4MmXXzCOA6ZW4nNznFUIXAQ 5umQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=ZDvwudD2OUU3CkmC+0yp5mbskWsheoSU9H38qbqCoKg=; b=jua2L0PazHWcBdsTbCKRH2N/jCXIGwOjW2T508+HnPhgjNP2fn3gblDgbImKRA5hKs a6extxcnt/lM9XDycOEtb7MTQTdEEAisPduthC/Tk4KmOaHsqwhcJk49P9BlbG86SThf ut2GxdkI6578zC75hQJX2sf3OsB0vX80LxK420oZ79EeF29fzb4Rr6VopJOBS+zNZE4M 1Ss7+LmH2XWQsJy/1fiivLsnur4u2FTk0WfK5ZiGrH/Y7b+jkU3WvDmb4Rx+Trcls9Yr jj65TxdNSbiACGj1nMHVKY8/uXAp+EU/7pAdA4NXiZTpY8sn3eteNdERnDL8cbUjMJAj tZpQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.14; Fri, 05 May 2017 12:48:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751653AbdEETsN (ORCPT + 6 others); Fri, 5 May 2017 15:48:13 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:56962 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbdEETsK (ORCPT ); Fri, 5 May 2017 15:48:10 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MYGci-1dbTSa1Hg8-00Upsj; Fri, 05 May 2017 21:48:08 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 12/87] iio: adc: fix building on 64-bit Date: Fri, 5 May 2017 21:46:30 +0200 Message-Id: <20170505194745.3627137-13-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:mT0Xwee/wkcva+2PEAuh7YpmFR6etCutwDxqW1JkRg4VOB/wBNh yEY6T3bvQDG2XYQ2vCVEQiypPZdhmol3NC6cfHx+nHTJJKIw0T3BVobiVxyNWttMeQVX5r9 bbxSTAgTJILO+qJ95wjueRB1+3I6sMjJ2mVxImrgqiil7wNdUFVUeGHi6F9EZI6VzZ3lU9n uHX5w/HdN8z8qBtCLrw1Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:+n+8aFUH+10=:Sn/16NCodubHNjCNvNY6Dw IILdMNLvSnotbqKQ1rU+mszKtDUpoKrfjGrmUk+O8oKdcD1z76PWUbXd2uJlsRm4A7Mjno3X7 xkr+hFm6y+m04oEFX/2OJ6hEBL7b4lRfLrKh27aZh1Ox5lwuvjDmRqur3nF+jyXBQZjkEgh/L rjaRCjMNoY7k6ynpFAcoKCEE1cWnPz4NE+GJIfdwif9YsoJ0F/v0eBoz/Q6PnNJnPE9lU2f9M L3mMClHhpFGZQuIZ6F9PnNMv/eaLPtkE0KclT4TSPiOUsNwsPeDcPbe7aHtcq4FNdilqXES4L GvSDnmcQPx//aWTlL3kvjvBzlqXUiCF5lyBTMR/at7WifFpqyg6LE6NXRC93dLRtL3vkH2kD8 +DSeVc0CAjphY5sGeY1U2NuVI/JzVksemP9yA8oplzi6P7IxYstuE/uKKKMECL7F2TjnFIuJ/ HqIR+n1hNypJuPQjtQxMFUVAKF4AH5tV1m5OMa/MT9H0YfXle2WHAzMYL8ClDZbbKAVbsRVwt uUo87YyWBI8W5NSPkTvPgEwaO3cclH8pNdqxb9oP71GuNMA8eRBwMNEcTmI76ZYMZTkeB3SC7 uKB3XeSN3e7t5nSWz26ghQUxSObuygqLSCWn2zRRxywGKpZ9jSY7tDuOfq6OtVuIqGF1jIDmM Qc0ZYLkOCVw8ZQrANWa+tqyBe7OSocUr4rgcuQ3JrHaR08MhjJzuT29FzJKSb0QKUFtE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On the 3.16 kernel, we get a harmless warning: drivers/iio/adc/exynos_adc.c: In function 'exynos_adc_get_version': drivers/iio/adc/exynos_adc.c:112:9: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] Upstream commit e49d99e0ecc8 ("iio: adc: exynos_adc: Add exynos_adc_data structure to improve readability") in 3.17 removed the function, so we can't backport a fix from upstream, but changing the cast to use uintptr_t is the obvious fix. Signed-off-by: Arnd Bergmann --- drivers/iio/adc/exynos_adc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c index 010578f1d762..bb7c50cd3f72 100644 --- a/drivers/iio/adc/exynos_adc.c +++ b/drivers/iio/adc/exynos_adc.c @@ -109,7 +109,7 @@ static inline unsigned int exynos_adc_get_version(struct platform_device *pdev) const struct of_device_id *match; match = of_match_node(exynos_adc_match, pdev->dev.of_node); - return (unsigned int)match->data; + return (uintptr_t)match->data; } static void exynos_adc_hw_init(struct exynos_adc *info) From patchwork Fri May 5 19:46:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98663 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292679qge; Fri, 5 May 2017 12:48:18 -0700 (PDT) X-Received: by 10.98.86.207 with SMTP id h76mr3659736pfj.205.1494013698322; Fri, 05 May 2017 12:48:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.18; Fri, 05 May 2017 12:48:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755485AbdEETsQ (ORCPT + 6 others); Fri, 5 May 2017 15:48:16 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:61723 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbdEETsN (ORCPT ); Fri, 5 May 2017 15:48:13 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M6alo-1e0b0u2Kpw-00wQwL; Fri, 05 May 2017 21:48:08 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 13/87] infiniband: mlx5: avoid a compile-time warning Date: Fri, 5 May 2017 21:46:31 +0200 Message-Id: <20170505194745.3627137-14-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:AtYDhaFzefRoAeW1GIoX9eYOJRINzUbPVYMD/NZ9/d2IhvL7x2d szWtXVBUSwMNhtl5KdeDpzJ22uzza4tJUFYrYZDrdb13KpeoQBQ+7hakhQimSMGT3EXeMlA iPHtX3GjVVNEHs81N1zLuu166TBUl5JkaArWZ50cZV5FN/yKZXFgmEWyQvLO/nwWtMLRkOT VcwnmJne/Cgdz2J4tgzKg== X-UI-Out-Filterresults: notjunk:1; V01:K0:9S3DV928fAw=:Dc8Vls3NJ764cBLQhhIey3 pelYUjroD1mr9Ad68keKqCGxLWqWYeNgsFYECuqR4t2LV3aNiyr8thne0tkCENs6IJBgCY3wz Q1i5ezNf4K1sEf4KTWasb1zEzVeH3zE5xNVmFjCqz4ZQK86ztQ9UGiBIjP2pat7UfgVlAxAZk /vGYFbIRngx+jKI5r9WMHKVIpGAB+39IlOg0Our/pvVUcZAu9jjg5wyueeIZCBEJW67ivbXWp eyyrGQXksLlJBUQkkr85g8Zv76PdfX7dc6g1S/ZtEkc3tYLOKJnQgMrRhzxSdtEjIpbMmkgJn IttDVAedDFGRn8sX21e7KTgeNOvsHwsYI8pGFYl6bAPdPndcCwpWtCYB4cNuqx4Hs9diV33Uj mnTMHG3/8vPB3/942hUOgT6picG/D/2cDLHBaWrfV6CreI/1xcgzgC/ga7/MF2wEiufZonyXw vCMiVq6+JK2pYirfsqBQGOHpASqdpN4H+dJPLA7yVK2C2sH5xuKvdp6tPm9A98w0M0E0OvYf1 KlntUmqBQx0WgjFHO+44YUKZ6xsPellLdTw0MypdOUnGB3VgCvdJUSBPyXhP2MxED7ADnRxAF Ix+hJmiwt+1no6PwlXiliub/cTDjYqeqhz6f88/zBkT0GxK++5u2nxb/ZR5KkfumRXisBl3j9 unWxrBUqL/IP2RwgzuAuCmpE3odVQgJ+dehRO/CtJWB5FaYKwb5IXyFJCXULIgGbdA4E= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 7835bfb5261501590a508b3de3379e2231cb4853 upstream. The return type of find_first_bit() is architecture specific, on ARM it is 'unsigned int', while the asm-generic code used on x86 and a lot of other architectures returns 'unsigned long'. When building the mlx5 driver on ARM, we get a warning about this: infiniband/hw/mlx5/mem.c: In function 'mlx5_ib_cont_pages': infiniband/hw/mlx5/mem.c:84:143: warning: comparison of distinct pointer types lacks a cast m = min(m, find_first_bit(&tmp, sizeof(tmp))); This patch changes the driver to use min_t to make it behave the same way on all architectures. Signed-off-by: Arnd Bergmann Acked-by: Eli Cohen Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/infiniband/hw/mlx5/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/infiniband/hw/mlx5/mem.c b/drivers/infiniband/hw/mlx5/mem.c index 8499aec94db6..deff377934ff 100644 --- a/drivers/infiniband/hw/mlx5/mem.c +++ b/drivers/infiniband/hw/mlx5/mem.c @@ -68,7 +68,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift, for (k = 0; k < len; k++) { if (!(i & mask)) { tmp = (unsigned long)pfn; - m = min(m, find_first_bit(&tmp, sizeof(tmp))); + m = min_t(unsigned long, m, find_first_bit(&tmp, sizeof(tmp))); skip = 1 << m; mask = skip - 1; base = pfn; From patchwork Fri May 5 19:46:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98665 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292685qge; Fri, 5 May 2017 12:48:19 -0700 (PDT) X-Received: by 10.98.43.13 with SMTP id r13mr18684483pfr.32.1494013699426; Fri, 05 May 2017 12:48:19 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.19; Fri, 05 May 2017 12:48:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755493AbdEETsR (ORCPT + 6 others); Fri, 5 May 2017 15:48:17 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:56479 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755211AbdEETsO (ORCPT ); Fri, 5 May 2017 15:48:14 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MZKwe-1dKxjo3U3o-00KvK5; Fri, 05 May 2017 21:48:08 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Sebastian Reichel , Arnd Bergmann Subject: [PATCH 3.16-stable 14/87] power/reset: xgene-reset: Fix prototype of xgene_restart() Date: Fri, 5 May 2017 21:46:32 +0200 Message-Id: <20170505194745.3627137-15-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:wjdh1OO/8S6fvCauu8mC7L+rLHszY4iiH6XEros5w9ymbcoST+2 TGsn0wEd1LP5ujV9ernDSMbLTSguBcGO7CZ/Q+I2yoswqAA8kVdwJpBmgiKg5/B8M7MlAQs i6pMo2imtX+H+xD/lPmXAhaH2fEkpKkAfIC8BDG+5UPldFjsCx1gs4gU6sh43MHZGSX4hHq n6t8K6Nb7qZDQDVvEIXcQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Kgf8peGDY0Y=:f9MGxCZIiNZ/Nqevz/s+8K g5bmsFLN9PYlSF6jBEzJrI3T/7IlghNxy2pvy7wy0E8+UpJ1QnULJvQJbUxTHnAnKqGP9J73d QwD7lgtlDeJMZcfLfIpDLM4BdK/+lKPP4KEQwNFDyiuhQMCAjrm5wmC4mPvliArQPWBAuBs9G g3naqQSHCerr1nESx4TTaikfBvhdGVBBXiw3+6OxhrC2Jja3j8RNb61YDIVz9ikLFqTG8VF61 Ud5Dmxfat/zPTxqHYdFp10i1tEnWb4vM8pgRN7HIFCS7CJeuJkbFuw0mYCEj2hFTW+G3dv8HL 0RDK52zfP3CtczwKjPvn4ohyZm2B4+7Yg+Rwr9Vd7Ufx7j9FliBeBWbmpjYLe1V0oTf/vUCeR Bd/OETGXMSbx+VyTgRgaR0lgQedn9WNrN016BZK9EpeZKWhiPYByhFQOe8F32JadZiaHGfu7c /Dbhx4P4BGgPzSjDebWrLQk6d7dPUc6kjHk1nFTjjXG35biM3SfTQEQ6Q8ugC57ZYVoabl5xK 0aTKuK1njYliuxpfaOuG7+5vCQeF8hMNAtdTFZVZgAMUCp9kXUdV5YxBzmiRgwvvyc8tcPpD9 Hvr8YwYIRp+YUJdkqboMTRxkyp2MqqAZnMzDuT3DO3jl8RaPpYHFbzmFLxrNYw9utlC2m/XJT VNnwnyXEOb16ZqGapJahhxmCU2nAsGqT61U2/PE7HxawsFgOmKjCmZ8v1/sgQLsQOICE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown Commit 777ad00725f7c8629db4640b25e19dc9665bb62f upstream. The xgene-reset driver uses xgene_restart() as arm_pm_restart() but that function should take an enum reset_type as the first argument rather than a char. Fix this; the paramter is not referenced in the implementation. Signed-off-by: Mark Brown Signed-off-by: Sebastian Reichel Signed-off-by: Arnd Bergmann --- drivers/power/reset/xgene-reboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c index ecd55f81b9d1..6b49be6867ab 100644 --- a/drivers/power/reset/xgene-reboot.c +++ b/drivers/power/reset/xgene-reboot.c @@ -40,7 +40,7 @@ struct xgene_reboot_context { static struct xgene_reboot_context *xgene_restart_ctx; -static void xgene_restart(char str, const char *cmd) +static void xgene_restart(enum reboot_mode mode, const char *cmd) { struct xgene_reboot_context *ctx = xgene_restart_ctx; unsigned long timeout; From patchwork Fri May 5 19:46:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98660 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292666qge; Fri, 5 May 2017 12:48:16 -0700 (PDT) X-Received: by 10.84.233.200 with SMTP id m8mr41973691pln.118.1494013696158; Fri, 05 May 2017 12:48:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.15; Fri, 05 May 2017 12:48:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755435AbdEETsO (ORCPT + 6 others); Fri, 5 May 2017 15:48:14 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:64551 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754324AbdEETsL (ORCPT ); Fri, 5 May 2017 15:48:11 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lup4D-1e6QZ60QEL-01045s; Fri, 05 May 2017 21:48:09 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Lee Jones , Arnd Bergmann Subject: [PATCH 3.16-stable 15/87] mfd: arizona: Rid data size incompatibility warn when building for 64bit Date: Fri, 5 May 2017 21:46:33 +0200 Message-Id: <20170505194745.3627137-16-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:iN5oPKGpUkjbWNbDS0eKeaE6wlwieOvt5ACPmVbqm8eHUTxbIb7 skbQrasca68c9zAhetoaKMeXrKVk5gXoP2v+AkU09mE4uoTHQPdlljeX4zGZYVZbX6GP4R3 3/IYSqAZkaeDjeo1SQppyx6kxaUnVaJo9PSiFitnSjsYp+A1f2LuWKJk5ZGZexNJ8l7yPs8 Yl//8hMEEki2HJJicmOdw== X-UI-Out-Filterresults: notjunk:1; V01:K0:FlxKI5ySQBA=:7+UHUiguxN3n2WnUwTnCAM F6RCpSsESggZuoW9XO1V/UoFEYuerwQ/inHo9fAK3OasUZbL3UC92p4j1ZkI6LfjkU8VRJ9mg tWeB9LncZX7fahPMbSzjwNtvObBUDa8CtwDj5aKy5YimVrQcc0Wa0eT9j9IXuUrWC7b4Q2FcC Iog0WevLwy6rC7pvRw/qzURStswgN8LlQQZx2lr0Rn3bp2wpmYjSzV5ymSf8wl50jmel+qPpP Pp+Oc6TD9zenUikXcHR8BR6rPNbdfhKqFSV1Fu8KUaF/YSndtl4OIinRtYc4f5BxFtGbVlzwh h/97AoWaCB4nN5B7cBnVOAWSlUIYkOtWn8+NAAtJec2S8P5FvaGvHmrSLFgfa124Xx6uF61tJ ymI5gmGr/AqxvAoohUTsXyrHgWGBqBg9X6FZmzHu9u5Ei0ZYwFKBfGpUNxOUbvxAOcZ+PQ9e8 cAliRt4keMesJeN+ewA04IV5zX1/z0GAZrt9LaUrSs6EE7NRgmMzU8CLxmRkfg4AQozMkVjEy Alkj0plwjASKq4rk3admary6aGpZfAMJZiJNVhxg6dI6EuaXX529lfPwbxLKyIiPiB47wYQ9U hU8zl7Bgv07TMeZjyQ/ughYhCTln2OZVvqC/V5ZHuIjAPMU8MWvj/UngmHR3VGc5qxZ/TI4oW pZg/4z9dpqnv02Jjm72gymngLFDogfP4qYx07zR4JRXK+JtsSxzMJDMyqriogqrdu2x8bN2dB C41xhDcwNvjBrwLs Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lee Jones Commit 06128eb07567dabd85aa8249fd60c9d2a060b057 upstream. Extinguishes: ../drivers/mfd/arizona-core.c: In function ‘arizona_of_get_type’: ../drivers/mfd/arizona-core.c:505:10: warning: cast from pointer to integer of different size Signed-off-by: Lee Jones Signed-off-by: Arnd Bergmann --- drivers/mfd/arizona-core.c | 4 ++-- drivers/mfd/arizona-i2c.c | 5 +++-- drivers/mfd/arizona-spi.c | 3 ++- drivers/mfd/arizona.h | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) -- 2.9.0 diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 1577e6418306..c39d119b4cbd 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -497,12 +497,12 @@ const struct dev_pm_ops arizona_pm_ops = { EXPORT_SYMBOL_GPL(arizona_pm_ops); #ifdef CONFIG_OF -int arizona_of_get_type(struct device *dev) +unsigned long arizona_of_get_type(struct device *dev) { const struct of_device_id *id = of_match_device(arizona_of_match, dev); if (id) - return (int)id->data; + return (unsigned long)id->data; else return 0; } diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c index beccb790c9ba..9d4156fb082a 100644 --- a/drivers/mfd/arizona-i2c.c +++ b/drivers/mfd/arizona-i2c.c @@ -24,11 +24,12 @@ #include "arizona.h" static int arizona_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) + const struct i2c_device_id *id) { struct arizona *arizona; const struct regmap_config *regmap_config; - int ret, type; + unsigned long type; + int ret; if (i2c->dev.of_node) type = arizona_of_get_type(&i2c->dev); diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c index 1ca554b18bef..5145d78bf07e 100644 --- a/drivers/mfd/arizona-spi.c +++ b/drivers/mfd/arizona-spi.c @@ -28,7 +28,8 @@ static int arizona_spi_probe(struct spi_device *spi) const struct spi_device_id *id = spi_get_device_id(spi); struct arizona *arizona; const struct regmap_config *regmap_config; - int ret, type; + unsigned long type; + int ret; if (spi->dev.of_node) type = arizona_of_get_type(&spi->dev); diff --git a/drivers/mfd/arizona.h b/drivers/mfd/arizona.h index b4cef777df73..2951498ab9a1 100644 --- a/drivers/mfd/arizona.h +++ b/drivers/mfd/arizona.h @@ -46,9 +46,9 @@ int arizona_irq_init(struct arizona *arizona); int arizona_irq_exit(struct arizona *arizona); #ifdef CONFIG_OF -int arizona_of_get_type(struct device *dev); +unsigned long arizona_of_get_type(struct device *dev); #else -static inline int arizona_of_get_type(struct device *dev) +static inline unsigned long arizona_of_get_type(struct device *dev) { return 0; } From patchwork Fri May 5 19:46:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98661 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292671qge; Fri, 5 May 2017 12:48:17 -0700 (PDT) X-Received: by 10.98.43.13 with SMTP id r13mr18684324pfr.32.1494013697061; Fri, 05 May 2017 12:48:17 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.16; Fri, 05 May 2017 12:48:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755439AbdEETsP (ORCPT + 6 others); Fri, 5 May 2017 15:48:15 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:63307 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754699AbdEETsM (ORCPT ); Fri, 5 May 2017 15:48:12 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lq1p2-1dkAcj1UCu-00doA1; Fri, 05 May 2017 21:48:09 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Dmitry Torokhov , Arnd Bergmann Subject: [PATCH 3.16-stable 16/87] Input: joystick - use get_cycles on ARMv8 Date: Fri, 5 May 2017 21:46:34 +0200 Message-Id: <20170505194745.3627137-17-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:sDOOJdTlY/TIndUgyorp6Pwj9x1Y7Js3OZtWCt45cW8K8Ggs5De nwo1gU+/NHZx7rrEkuIyRDTyKLpy0IOGs3yOO1nGQ3oeUEJQF9bJlbdmTTnw3prLg2eCf7i uVbBUPk1Zq8TbQ/0zqhg46IH63tFFzc0aqO1f4RCGZwJzGfoJ1Zi9QcvTNjQgKd+CE+03EC 6gjQD8mtgxb5UptKJ0sJw== X-UI-Out-Filterresults: notjunk:1; V01:K0:lsXU8Q8iG0M=:jR3nXpF9iXDYHHNPcppnB/ 4El4+l8xA55HCSfFk43mXf2srlvOkt6EO6FHMgm04eWDvqsx2av0B5LnEF+IUekFAbZal4tdP nvcWgSgkLJT1XF3TJwCVO2DL5cswGm57Lt5BYJUL6iZLtq7HdVRu69uK52esyrdR9sOqux1Md yBqzt/pzyJ2gSPtHeJbouAjnSNzj6+BW7f0IPZKr4t26l/0M3vf27Ev0Ei/PL7hST/3mu3SbB b4OLQ2oHaL0+iobc4uGOe5boY01L+uys4inTun5lISGSdpTufaPjC3eccbk9HcUAc7oYIgZHK DIagH3LFWY5mTGuG1BoxS5bHnwTE/0mo5zQVGvI5Hjgf+DHQN0ttP5SxgxuvzM7xQ0a5KFqvr JhQmmTx3w1rH1mDICbgCU2/XgsrsnJPtw8r31UvsUjCQL/q5iIiPpur8b8IAruYTQ4rZTTfYT 7oJJG68wvasMud1oeGdUdOIVUF451Lwn01QQAW3T/x81NJFzjT/k1HxPV/FSpQnTN2mu0t6LL AVPtAKTDEjlF9k160l2GwabGbJJla3rl8pC9kOm170faszZtFD0wx08F67I7iMRmgiQ8lnPFJ 3yU5tAbZb0vANF8LIpI+idd6B0LHlc8hMEWAOo6C36pO8FdfI/KDZUjcXb871tUlWnR9A/W4n fiH411ICcXp3l/Vhqp+A8GAqLsM0zIC2n1lKBbDxe+c9Y7Jk9aB586uJkXHuJ44L1JV4= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown Commit 13ba5d947a6790a0fdd36f49e7ca88d889acdacd upstream. As with ARM the ARMv8 architecture provides a cycle counter which can be used to provide a high resolution time for the joystick driver and silence the build warning that results from not having a precise timer on ARMv8, making allmodconfig and allyesconfig quieter. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov Signed-off-by: Arnd Bergmann --- drivers/input/joystick/analog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 9135606c8649..ab0fdcd36e18 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c @@ -158,7 +158,7 @@ static unsigned int get_time_pit(void) #define GET_TIME(x) rdtscl(x) #define DELTA(x,y) ((y)-(x)) #define TIME_NAME "TSC" -#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_TILE) +#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE) #define GET_TIME(x) do { x = get_cycles(); } while (0) #define DELTA(x,y) ((y)-(x)) #define TIME_NAME "get_cycles" From patchwork Fri May 5 19:46:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98687 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292788qge; Fri, 5 May 2017 12:48:34 -0700 (PDT) X-Received: by 10.98.62.86 with SMTP id l83mr18771550pfa.114.1494013714755; Fri, 05 May 2017 12:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013714; cv=none; d=google.com; s=arc-20160816; b=EAcrp80YHFQQLhDPcFmWILb34rymTsaBr6G001+QvLWJf1t+IGi7lFKeYY72VId0KT EDSNu2Jz6xKXHhEC9EuuyxjIsY6fEhciILDZ2u/E7Byi/SR3WbQpoKThrzYvdKBu1fyw 7m3PLhpewYOBb3hgeIM12quEygjI8gztvS1EzacX8NdvA2uTRwf6xQYNYCs++cuzCpFQ 3rDgavou3OCbC8ysB5HvoYyfqlRXy0ftUuXXBb1sdagNgRqmuzZvRoIrPrb3GOWoj7XN sRTVtn6pgbzkjSqdBvhz2hmoDUTrdwOiqLVTG5wTNJ2d1pbzjqtDPHfM8+Gly/7doQ4D 3Wkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=GRQVDn7Z/nXH/fVB5M9+eqyFg0mxiPzBS8GD8MLg0qo=; b=m20urXJXxdv50ZgESHLeE9Gi/+9m+dIGu/iQihw5WuQoyIe5XlJzF0YrX6xsoDJrmD RvmwylvVXBRRUZucnf7sMCBKMLK8zy98N2w+cdhxrXRYMJwTJKTfkl8FgyFL2eqk5pyM zx1u8U7y3tsTA8QKvq3mxwahUrRvaefzjmulv8bjOfKN/buXLZMz//u6XEmdO8STdTjq EBlrPrPaiXcsnquhM1dSTOGNMVpaceISBJPKnIvXwr1I7TP+ABA7/8VPdIw+ksWXh4G/ f2QirP/Lh97S660WRnsJzyImFBUPy+sqbCq3ToW4SPuPZDrZ8ahxldU2ILRrAxrJz/P6 tiNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.34; Fri, 05 May 2017 12:48:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755611AbdEETsd (ORCPT + 6 others); Fri, 5 May 2017 15:48:33 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:60973 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755483AbdEETsS (ORCPT ); Fri, 5 May 2017 15:48:18 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M1vXH-1dvwyw2n4V-00tzYk; Fri, 05 May 2017 21:48:09 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Vinod Koul , Arnd Bergmann Subject: [PATCH 3.16-stable 17/87] dma: pl08x: Use correct specifier for size_t values Date: Fri, 5 May 2017 21:46:35 +0200 Message-Id: <20170505194745.3627137-18-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:2LkU4M/KZe8/KY7gQ2Pqpy0FFHTK0ethVwHcnG2ROAa41mfY8dp 0y8kfvmaie2Gbn5qq2hgcJDgFhMEjlTxeQWiYefo5xyYiKYbFKwbx0I4BPHQdEj0Uk8vMDH ulPgD3l0LjVCz3lq1b09uk5kz1CVxlnVvkQSeaNfzeUuoQHTu+fkUh1ypG29QKV6yI5EqXz 8c8CnKdlRG/4jgwXuIUGg== X-UI-Out-Filterresults: notjunk:1; V01:K0:KEAx6DV7Quk=:TVo73FFkCoXh7iKfWx+8WE CXK4IOLdbsovlNWXKecDO0N7zeGgfvyYWhXH8DrZYGbHSZBWlrkP5q5MhbjwwMxcd2dhtjrai oadoUoPDkjy0vdApoBfu/OwRszo389gcB2MNVoZQy0NAbAd5YmpmPquXsQNyY3c1Ah47B2zLf 8qIOysVNHbvo8Ip3E++5EjheFwLx2eLMXwep/bu0v6uZgT5PxAD2w0C8D60qcRbj317QkZLG/ HCcleR/OqG/Pr4v8gh14STbe6Thq05PxyX3BSIHNs5GxjGjEOGNUspn5hmYKgIYBgUfOBEkyB P79Eja52Rwn1aY0MrD76hDU7sTLAMAuP9fbHjUZLSh0nRlaOocryKVqazwnZvINDg9ZujkrXY /Q9a7Lt1DIvk0jtCVpynke+d55tMwNxqHRaM9Y/4kVcj9r0ui27QGsa5Git87zV/isAYF4pWy oae7xSgBrDz2LDSo0JqgICGt2PYkzXZfekuVUgTlgpjSr97Kxnt05CsCbpzVgiXlsSdJyV/QB di6iozLzMey4nnqAj8UlwiV+VcVw/fUwAymDPUKjEh8mEA9kwEN2VdqpjHEjqhtyouRpmbWdJ tvuXVUDEnzoRL2S/bFrAeWZ5xnYXpi/0Kp+NVAKXMlsIJzJuWFTwp5Ait/EVkzVArBMwc4rIi zIKbXr+RRf//zzXHhuMJsFk8X39Yywrmyl/TYhErMn6rjR0NyPJ6J5Z4N7a7AdXnbfnQ= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown Commit 3ec57792fe16343dd98f82cd6b8842753731f3af upstream. When printing size_t values we should use the %zd or %zx format specifier in order to ensure the value is displayed correctly and avoid warnings from sparse. Signed-off-by: Mark Brown Signed-off-by: Vinod Koul Signed-off-by: Arnd Bergmann --- drivers/dma/amba-pl08x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 8114731a1c62..8ff32b126605 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -1040,7 +1040,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, if (early_bytes) { dev_vdbg(&pl08x->adev->dev, - "%s byte width LLIs (remain 0x%08x)\n", + "%s byte width LLIs (remain 0x%08zx)\n", __func__, bd.remainder); prep_byte_width_lli(pl08x, &bd, &cctl, early_bytes, num_llis++, &total_bytes); @@ -1662,7 +1662,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_cyclic( dma_addr_t slave_addr; dev_dbg(&pl08x->adev->dev, - "%s prepare cyclic transaction of %d/%d bytes %s %s\n", + "%s prepare cyclic transaction of %zd/%zd bytes %s %s\n", __func__, period_len, buf_len, direction == DMA_MEM_TO_DEV ? "to" : "from", plchan->name); From patchwork Fri May 5 19:46:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98662 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292676qge; Fri, 5 May 2017 12:48:18 -0700 (PDT) X-Received: by 10.99.0.3 with SMTP id 3mr5271506pga.57.1494013698037; Fri, 05 May 2017 12:48:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.17; Fri, 05 May 2017 12:48:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755478AbdEETsQ (ORCPT + 6 others); Fri, 5 May 2017 15:48:16 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:51152 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752409AbdEETsN (ORCPT ); Fri, 5 May 2017 15:48:13 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LsLA8-1e3xab43Oi-011ztt; Fri, 05 May 2017 21:48:10 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Linus Walleij , Abdoulaye Berthe , Arnd Bergmann Subject: [PATCH 3.16-stable 18/87] gpio: drop retval check enforcing from gpiochip_remove() Date: Fri, 5 May 2017 21:46:36 +0200 Message-Id: <20170505194745.3627137-19-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:VHuI/5ylc5NvR5jZWzkJwPZgqp/JdjQ829lySjbH0niBE7DU+oE Pt02AlqfXl3HQLSBk8Cr9thaNfbPka0LNFTbJLRk0qzh1BIdTGv5wdqsSGyjApHdXJUidlU r5B0tZ0mN1mRQ74Q/lT38zIyd6ptu8b/9zKEwvE2xKBAo6iaN4NvzkrtjO/3GF89xM+rJB9 d64Dzf5Awvn1DZhr8i/3w== X-UI-Out-Filterresults: notjunk:1; V01:K0:+kQrva01jdc=:KirsMiJO4uN4LNo5E/ib8o jo0Dg+JSaxE9TYGCuExnoZplzqDtlgzPcjvMeMhkvPRJrFb/rLYecwcEu9cW7I1Fi1neWgyaZ ipi5kWStkj9pqWTWLWOXNsq7JCfV0cwbsgbP9uzLGFUMEseaZkdwfHlv4mBO4sgyXqU36J3io 35l7Y/ebRz2VdAw9BcFV/42Sr/E3uHx3aCCpDH8QOXLfznMaFL0gtXRx4j9noV75jY4LJP72o zB0tT4Ta3vdZ159bUacBPTqS8nJfCLQQIQ895EA/riEJfIgvA3fioh563P12wCcUYI3gC3Pc+ fk+w1EuTeeqkClLhedlVixH9f9xITDRXos4PEOyPU7NnNtlMu/EfCs/BT4RAERi4vHe8Texvm p9l4cgM3KbEqGuEtMMrX8GMXMwSzBe+9EZZTZpkpk+jlUC8oUHt1BSZwevPuwRlB+9KWANL9Z KutS75fjBi8ZtsVHLaVsEW5wnsTK+q+2wkvKNvX+/DDqmZdyWOtmeROYdICjQF6GoPMe9/UNN pJ2adapP6lLzACOiv2GGEwwvcJTH7qvfn8BBCGjafDsseu6dNNwb/45zqsnVKozL4L5P+VF4p HnpsRE5nJg8fC6CUuRaR1ZAGS+qE2xT1uX+zOJiDd/iorKtbhIcGwT1lVpIOduos3aHVhH9nJ ozE/plNFfrn1bkEBKSUg7xlvPPVFWM8radi2jqYHNUtbWmaGWuqGnrR6fSaT0Mp+hO/Q= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij Commit 62986edec3f06737cc5319df1aa41ecdc7e90089 upstream. As we start to decomission the return value from gpiochip_remove() the compilers emit warnings due to the function being tagged __must_check. So drop this until we remove the return value altogether. Cc: Abdoulaye Berthe Suggested-by: Stephen Rothwell Signed-off-by: Linus Walleij Signed-off-by: Arnd Bergmann --- include/linux/gpio/driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 573e4f3243d0..ca3024554a2d 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -141,7 +141,7 @@ extern const char *gpiochip_is_requested(struct gpio_chip *chip, /* add/remove chips */ extern int gpiochip_add(struct gpio_chip *chip); -extern int __must_check gpiochip_remove(struct gpio_chip *chip); +extern int gpiochip_remove(struct gpio_chip *chip); extern struct gpio_chip *gpiochip_find(void *data, int (*match)(struct gpio_chip *chip, void *data)); From patchwork Fri May 5 19:46:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98673 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292722qge; Fri, 5 May 2017 12:48:24 -0700 (PDT) X-Received: by 10.99.23.67 with SMTP id 3mr5280858pgx.4.1494013704901; Fri, 05 May 2017 12:48:24 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.24; Fri, 05 May 2017 12:48:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755366AbdEETsW (ORCPT + 6 others); Fri, 5 May 2017 15:48:22 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:56381 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754324AbdEETsP (ORCPT ); Fri, 5 May 2017 15:48:15 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LxGqg-1e8tGa3xoA-016vqx; Fri, 05 May 2017 21:48:11 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Timur Tabi , Mark Brown , Arnd Bergmann Subject: [PATCH 3.16-stable 19/87] ASoC: fsl-ssi: fix do_div build warning in fsl_ssi_set_bclk() Date: Fri, 5 May 2017 21:46:37 +0200 Message-Id: <20170505194745.3627137-20-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:TOzUsTE8fgfenSvRu4sGsiK/C8X1/7cXrL14EzIImFCJdkmvsxc /mbyyA/BW11um9WIeFG6AffWJ55Mk/BYJ18RgeZZNTReuAUknbO19VQLtyTTjcnsufYUpt6 xP10FLbfwQivl0D2JlSzVooCWbm3NZ4NmMT0inyqy42UPTU/6JLUWr8eVY4WJNTjB4+Tg5E 21GtcQnkx5UtyLhp3MBiQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:8NwlZ/guyCw=:2964SQ9vdlStiSQWgqEDxV sivXWwlEELVPxxP0YT6MVSNABh4Qc1ake1/XWzCwOIy6XodnTMaGCLvrjrc9BFwaMd2Iz7NYH 65BnoWln3IqOEOC5f+dzdsmJxlBXRvhbENhCPDKWTldvz/LyrbwHbts3tZAzn8ezKJT8Fl7V/ At35etw67XMFwvabuNVrIRBMyT6MMCz8OdY7BOj4mqNaGUowXwogVDys3zCo6NYGeFADqSC8u iLPOTaIMRiSE05WMUAnvmB9ucWB6jixFtAPDToX+MI7ASX8PKkigG2HnyhiJUztoGffnx54Mf Oj/ln+ycuDB7HJ40J2pSl07qJj3G9zL7bkAsBpGf/nvBaTPXYrjCpWKDixdeCBvgJe8j5i+iQ tfq2uAKCUGMovOw1LCfquwgJkWi3k2LSUSJOx5UbTbiYFx2wotN2wO/Iq1A67CakDo5RF3S5K vmgNLN8hElFAAMKw+plAitjyQ3uTDUuZ9JLUtTfrpfQt+zypjlwu+bUODdv34SU2rCCMqLbia fWxVFwQVwQUBUrBotvZGcYBx+iBA5R8m8HNRfEMVfd2lA7WkNt6tqeuSKefdQn+jOFcsS6LAd 1Kf7SnlpHUoasulBkUYT5FJpI04Szz+xeOxNvohS8fUHiQLIkg/BEFYh8WILmolQFei2Xy0Fp NGz183daeuOIDC+jEE8kSiMsCAC3vNrTrblpjXwCvpXp7VN/NNN0D3Hr3oWHsOk20EMc= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Timur Tabi Commit 95af467eed7c85e7a574a50ae60316111434a118 upstream. do_div() requires that the first parameter is a 64-bit integer, which but clkrate was defined as an unsigned long. This caused the following warnings: CC sound/soc/fsl/fsl_ssi.o sound/soc/fsl/fsl_ssi.c: In function 'fsl_ssi_set_bclk': sound/soc/fsl/fsl_ssi.c:593:3: warning: comparison of distinct pointer types lacks a cast sound/soc/fsl/fsl_ssi.c:593:3: warning: right shift count >= width of type sound/soc/fsl/fsl_ssi.c:593:3: warning: passing argument 1 of '__div64_32' from incompatible pointer type include/asm-generic/div64.h:35:17: note: expected 'uint64_t *' but argument is of type 'long unsigned int *' Signed-off-by: Timur Tabi Signed-off-by: Mark Brown Signed-off-by: Arnd Bergmann --- sound/soc/fsl/fsl_ssi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 9bfef55d77d1..3043d576856b 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -590,8 +590,8 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, else clkrate = clk_round_rate(ssi_private->baudclk, tmprate); - do_div(clkrate, factor); - afreq = (u32)clkrate / (i + 1); + clkrate /= factor; + afreq = clkrate / (i + 1); if (freq == afreq) sub = 0; From patchwork Fri May 5 19:46:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98664 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292682qge; Fri, 5 May 2017 12:48:19 -0700 (PDT) X-Received: by 10.84.233.131 with SMTP id l3mr30375619plk.18.1494013698986; Fri, 05 May 2017 12:48:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.18; Fri, 05 May 2017 12:48:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751284AbdEETsR (ORCPT + 6 others); Fri, 5 May 2017 15:48:17 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:58310 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752999AbdEETsN (ORCPT ); Fri, 5 May 2017 15:48:13 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ls3eJ-1e3gCy0qfn-013vAw; Fri, 05 May 2017 21:48:11 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Arnd Bergmann Subject: [PATCH 3.16-stable 20/87] ASoC: imx-audmux: Use uintptr_t for port numbers Date: Fri, 5 May 2017 21:46:38 +0200 Message-Id: <20170505194745.3627137-21-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:cagsY8++YIEh25+5BIcOP9A3JOfBYuKHQZYFcmAurTAjNdukPr/ +eEXjs9qSM5n1nziKctKwtS8FFuHi7mtaaFAQCZ5ZccV/6pzsNXPB5FBCzxmdzznPz/mNLP hBECLt5nl+P1dGaxAWj4InoMmM4zMy2aMI3cZPi9cQi4TwI7PMkSQGI6TrcKs9NN6I+Ek0Y tzSjkEYYSHHlJgzq/T5Og== X-UI-Out-Filterresults: notjunk:1; V01:K0:6iBl/XsEO0Y=:wY48mmW861YEVj7idhEOE7 Kfjog5Ov0B6mcNnAgXS+Gu2FWX+e7JKK8j8Ny5Htet4EeUKvU52s8b+KelRR08gjldQ/iOgFj +mbp5nj77LfIE3arx5fNQOgwYWxodgTD91NIO6JA5IcboCzHHT314UaZvJAJJim5bXqIrAiTy AD/5zvIrZEVnWzOmsU+7W7ndFtznc9UnABKCVLPMabBdAa0JdmsK06tzpdvkxx5+gdjxKDkp0 OsQEWCcYxObDV3bs3ORHeuxHy+DWGaJ7FVncCmrW+Vx3NKQIWXkWxXsRJdtk+5t0ciZjTDS7C fpjN8G7+rfxlC+sZODfPgyAnh1GcvyCTnDoINSt4JpqTvgsGyai15IrJ4/gOG37QxzQYExFkK IWl5XfQUmoHZykw/wsenTDYFiEg6qer02wD3aDvenE1x80y7+E5ALf+QQx8mFq9VNeSYBnAKP tP+5guw6xNU0DjVz13sxnRqN0Em0E34yMn2DVJjcIrHee+GnvMxh+0ZdhACyIZhAZq5OiUtwJ 9jApnOO6lL2Z/GljlT/twBdqkwbaLgDPDPg1FMz6f3OjD9e9w44FnKB3n7jgrEE9yjxbinC9a OeokxkOIanCzq4bUKxLV0pUxWp0DDFSM8A+XSzRpyMxbAbmLh595r/4c+52iLuayRTT3FCFHl /3MWPduXuzHXYaF85VqmZYOKJujRHtcS+D7dzzjQiV6ejuP3tCmHvjz2J+Znt9Mot0YM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown Commit 30e75719940ef0a873778f69e2d129ab516ae31d upstream. Since we pass the port number through file private data for debugfs we cast it to and from a pointer so use uintptr_t in order to ensure that the types are compatible, avoiding warnings on 64 bit platforms where pointers are 64 bit and unsigned integers 32 bit. Signed-off-by: Mark Brown Signed-off-by: Arnd Bergmann --- sound/soc/fsl/imx-audmux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 267717aa96c1..46f9beb6b273 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -67,7 +67,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, { ssize_t ret; char *buf; - int port = (int)file->private_data; + uintptr_t port = (uintptr_t)file->private_data; u32 pdcr, ptcr; if (audmux_clk) { @@ -147,7 +147,7 @@ static const struct file_operations audmux_debugfs_fops = { static void audmux_debugfs_init(void) { - int i; + uintptr_t i; char buf[20]; audmux_debugfs_root = debugfs_create_dir("audmux", NULL); @@ -157,10 +157,10 @@ static void audmux_debugfs_init(void) } for (i = 0; i < MX31_AUDMUX_PORT7_SSI_PINS_7 + 1; i++) { - snprintf(buf, sizeof(buf), "ssi%d", i); + snprintf(buf, sizeof(buf), "ssi%lu", i); if (!debugfs_create_file(buf, 0444, audmux_debugfs_root, (void *)i, &audmux_debugfs_fops)) - pr_warning("Failed to create AUDMUX port %d debugfs file\n", + pr_warning("Failed to create AUDMUX port %lu debugfs file\n", i); } } From patchwork Fri May 5 19:46:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98670 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292712qge; Fri, 5 May 2017 12:48:23 -0700 (PDT) X-Received: by 10.84.233.200 with SMTP id m8mr41974246pln.118.1494013703011; Fri, 05 May 2017 12:48:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.22; Fri, 05 May 2017 12:48:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755537AbdEETsV (ORCPT + 6 others); Fri, 5 May 2017 15:48:21 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:52829 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752409AbdEETsQ (ORCPT ); Fri, 5 May 2017 15:48:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M4Nqe-1dyP9b25im-00ydrV; Fri, 05 May 2017 21:48:11 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Nicolin Chen , Nicolin Chen , Mark Brown , Arnd Bergmann Subject: [PATCH 3.16-stable 21/87] ASoC: fsl_sai: Set SYNC bit of TCR2 to Asynchronous Mode Date: Fri, 5 May 2017 21:46:39 +0200 Message-Id: <20170505194745.3627137-22-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:w4VLs///vGmd2f/khWzzUiCeoc4jTG7Ydmj9b8zlQzNnODo3LXY OXH0FvYNm4eDqEFskt9JsVvcHsuy2OlQKiEEX4Cetj6LkQi4SifHeFwNKOanliAh86f5uKm Y5lbwAPGvdHwaspLFV/yqZbL7CwUuHPm99Ue2jj0uB5+6YXuZkP9g5m9kjUaSDtUk0rfiKb 4P/GdSIvhysX5pR+JNqWQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Ob823CGeENQ=:dBF9Hb2gkHRWGlH1R4ax4d U+iNbUpBhBE4YS+0r1/enkq9Gft7UaJWfD74TLTYwDsI0WkUfvYahs1GAa5+pCK+kvzpjvdca 9zQcfQ3Ya+Q1RTR+EdevLyK6EiAVFT7xGSKQJn/SqaT6cqeEyz3BX8XqRYZuzvhSPFMcH3vgr j3A1c4weRy82v/9UzBavxpfuVUxTt5GmFGZnReP7YOV1bpA34E7hHtUqgg0Ut3UJm8SVuBqLP GHUJdcBxKHyaWLchxfJbbspx5ddbc8P0xsZ17WKv31fVzWTbssIl9X9gNVSEtITe3vgvNInnj h6Ihy3OXxmCVBTPOQ3Qcr2mAMDcXYTZd/3SA1ygzkTVElh+FKK6FLlvmjQDS1lLc7MffkaivX QwEpy7ucIwxSMmFZyVQfn+Fw/JwTwnAHOpKPGHh3PduF86ErPjfQxs1nzDeEgOdrOC5+AZHVB sZrPiNiHm1aVo2yyeJAwQFGKY3Y4ofni7xNXK9BhjFzDfn+F96NDyJeMDIMpjgva6H+63yeT+ h2bnDj87h9pShPhs1zI5yLIc4Qf5gFiFPW4WmNF+uc5TR73N/tH47tYvWEWJ6UikNVrkTu4xC ybZcqvWXyrpCu1y422G+ZebBQI2zevFjfJq10zQb7RbV4uc5dXOwVlF0s3ZsoXQU2nL7pXKg6 u3egJXB9xBnjoGvaSS7j8I87toIBW7hYashkBYnb+ifquz/BC2saNyIgJ7/9Dzt2JyS4= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicolin Chen Commit 497782d5b44818b8482aa8b6b2dd9fccd99e63d2 upstream. There is one design rule according to SAI's reference manual: If the transmitter bit clock and frame sync are to be used by both transmitter and receiver, the transmitter must be configured for asynchronous operation and the receiver for synchronous operation. And SYNC of TCR2 is a 2-width control bit: 00 Asynchronous mode. 01 Synchronous with receiver. 10 Synchronous with another SAI transmitter. 11 Synchronous with another SAI receiver. So the driver should have set SYNC bit of TCR2 to 0x0, and meanwhile set SYNC bit of RCR2 to 0x1 (Synchronous with transmitter). Signed-off-by: Nicolin Chen Signed-off-by: Mark Brown Signed-off-by: Arnd Bergmann --- sound/soc/fsl/fsl_sai.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.9.0 diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index c5a0e8af8226..60465646fed8 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -333,8 +333,7 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd, * The transmitter bit clock and frame sync are to be * used by both the transmitter and receiver. */ - regmap_update_bits(sai->regmap, FSL_SAI_TCR2, FSL_SAI_CR2_SYNC, - ~FSL_SAI_CR2_SYNC); + regmap_update_bits(sai->regmap, FSL_SAI_TCR2, FSL_SAI_CR2_SYNC, 0); regmap_update_bits(sai->regmap, FSL_SAI_RCR2, FSL_SAI_CR2_SYNC, FSL_SAI_CR2_SYNC); From patchwork Fri May 5 19:46:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98680 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292748qge; Fri, 5 May 2017 12:48:29 -0700 (PDT) X-Received: by 10.84.140.5 with SMTP id 5mr68066591pls.113.1494013709162; Fri, 05 May 2017 12:48:29 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.28; Fri, 05 May 2017 12:48:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752456AbdEETs1 (ORCPT + 6 others); Fri, 5 May 2017 15:48:27 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:62417 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754515AbdEETsO (ORCPT ); Fri, 5 May 2017 15:48:14 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LpkJD-1djtF63BdH-00fjR4; Fri, 05 May 2017 21:48:11 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Arnd Bergmann Subject: [PATCH 3.16-stable 22/87] ASoC: adau1977: Fix truncation warning on 64 bit architectures Date: Fri, 5 May 2017 21:46:40 +0200 Message-Id: <20170505194745.3627137-23-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:N1Y87lPjJwxPsUy4ymA4+88f6Uf4Ab4RG73yCIxVwy71YV3ChF2 5XWHyZ2Ps89f929HZq+2n/GQutN1mri4oe5yxrahpwmoyuT0KwowRKujdT7Jyo/U5tYJGxT BFNssOo/l7o8Rjuwd4jggiNBTljnCFseOfoCM/a6V8h2//ffNmGZ4NgY4SkLQ9CIwzrhP0w o/TbuuWllVLjmR3BoPG7Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:zWrs14mzsnQ=:mdNo7azPmMMyyZa3K5YHI9 QJfkRlYY7yaRd0Hh6acYMvjxUIWN4FnZrTn5JRqZ1s/T9T+pCNc4jVk0X4eRHIamMZSByJ2+1 MDVBpe8Si6gsUQaCf3vMLKEf6jVKNBqYq0WlN7/OMbqjRVs+DpELSHPIoEcyvyfGV3TmNIj0C ConVgdAGafQOcdTRjtEdN9d+BvRJaL7M667ul4mwHo6i9/HsYooE/fc9VljuRC4ct4e9Ak7nX uu7SV++4i34QEYYonnvquQeTi2Mzha25UNFUh1gLVILdDulSxJU0L/8h2CZnxjgDDvIhSK/+O Ljle6n7wq20qWT04LgIyP4B6lJFPpJBe9rjRgXkGU05jGrtWA76bHwGI+j9Shdbo0W0WfKkGl CpyA8SSw/9r756ZVa10UHCjLyd5qH+oHS9IWcGZ9Iz1mRakxqBO8vzJlFIoB5cQZRmhumUMo8 oX122tYAnBfA5R6N2532RNf1/h7QsuR5LNolsB21exczgfC7NRMFMiqFw9Td30CXxz03a38mC nd+y54ci9t1c3HG+a/JCaIOOpgmbwvL3X5q4Ez29ahT1NYKO3ZsApba9hn+tgY6a7XuOcZ1YY DsMygf2FfWkDveFVopPSQW2bAYOrXRd5q7g6Xy7nI8i50m71RbBdtmI+a0a+gXyhkepLII/uO kU6JOlwD+U6YZ97gpH3xx84+7WOAKzakiNAMNU4Bzw8zHEW30LNd++JJymRUqsHeXbO4= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown Commit c675220dd64cfc59ba5ea20710bd76d67faad148 upstream. Negating ADAU1977_BLOCK_POWER_SAI_LDO_EN creates an unsigned long constant with all bits set which on 64 bit architectures needs to be truncated to an unsigned int, generating a warning. Add an explicit cast since we know this is OK. Signed-off-by: Mark Brown Acked-by: Lars-Peter Clausen Signed-off-by: Arnd Bergmann --- sound/soc/codecs/adau1977.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/sound/soc/codecs/adau1977.c b/sound/soc/codecs/adau1977.c index fd55da7cb9d4..70ab35744aba 100644 --- a/sound/soc/codecs/adau1977.c +++ b/sound/soc/codecs/adau1977.c @@ -968,7 +968,7 @@ int adau1977_probe(struct device *dev, struct regmap *regmap, if (adau1977->dvdd_reg) power_off_mask = ~0; else - power_off_mask = ~ADAU1977_BLOCK_POWER_SAI_LDO_EN; + power_off_mask = (unsigned int)~ADAU1977_BLOCK_POWER_SAI_LDO_EN; ret = regmap_update_bits(adau1977->regmap, ADAU1977_REG_BLOCK_POWER_SAI, power_off_mask, 0x00); From patchwork Fri May 5 19:46:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98677 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292733qge; Fri, 5 May 2017 12:48:27 -0700 (PDT) X-Received: by 10.98.43.13 with SMTP id r13mr18684993pfr.32.1494013707233; Fri, 05 May 2017 12:48:27 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.27; Fri, 05 May 2017 12:48:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754833AbdEETsZ (ORCPT + 6 others); Fri, 5 May 2017 15:48:25 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:49985 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751529AbdEETsP (ORCPT ); Fri, 5 May 2017 15:48:15 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lf3TU-1dqoS40Blg-00oqlp; Fri, 05 May 2017 21:48:12 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Tomer Barletz , Takashi Iwai , Arnd Bergmann Subject: [PATCH 3.16-stable 23/87] ALSA: oxygen: Fix logical-not-parentheses warning Date: Fri, 5 May 2017 21:46:41 +0200 Message-Id: <20170505194745.3627137-24-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:f+Mqyv1mUSiaEEIOU3m4bFjVv0BrxzbflhvtQZtZQnr1kaUcbJd wvL8yTAGRO5Ap1bizcY9ZsdBe1Sxv5tI3+tiA3pOaJz80nCQSKxTsW/QS+xW4ZdZk2lSPm+ nveOQJFnfVwbYj+hiDs68cVvgt2WEA5f+eBgcgQ35BaKHpsUDZwrvKvBUTT1ugHCnuHbLui frRh8Yjw8VF9qW6SzrBeg== X-UI-Out-Filterresults: notjunk:1; V01:K0:tXzSrls9lGU=:nhR+dK79xd200yBwZkC+lX uHjY35QQDbpZFiuJ+s8J05/UmrKORBYL+reGEWVCB9jG9k8vjp8nGT1EuLyQfqIgz8RUH2mip 9uO6uB3R7VExl98rlFNvJ4tuCfGfxUmgpIxrIoN5lR0qkRkJ8nCHAs7AhPEHxJwwBbavnDni+ iY6iA/SGRkY8aBxr4wZw5IIlWu01tm49NhIYmAVoJAFmhRdmz/B+B5tERGShKgfBy8kpjpIXX cSNogG5YT5XGu/01Y1gTXZaQi7/NyrhdBFPjZU6cTbuUQIfR19u44HNQNw0vqFUgLCHEP5Lw9 pgVQQfLOO1/fcrrVU1U9gOYJGvqvil4vVrBvPjIeL5DwpdSx3D4w0UhA/jWBSP//Nm67vJiOU 3GdahvuqDWaiJ/WCTpNsT+7yV8gvMTwr6GUx9z7zhxCc/FnRJYo5mm5U7biIbGg79pH9wMSmw bj45wa21xLT9KEjcxcsK6n6d1NZYraUlI3rL6+qICBtPn+DezALHlZAB7nSxWad5pDl9QjqdV QyivN6SV7Fy5hENmNztLP9PNsbszR8NKod5ZmaEVS3xYkhWk6RBAhNfGKvuhSEbkx+gj4edgJ HIkBDbiLy0v/3K8f49emlellIlllyx7G9HQHEeBPK8Z3oOGmZc0WONZnR9t4g8BgqliWaWKe6 8k3M0hSF/2WcicsNnBFW8pl+rp9okh2mEfpm5AqPZnQjAEf8AyAUNS+4WIJqGHjfg+Aw= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tomer Barletz Commit 15ca92c8a00b566a2e6f7d4f088f867575dadf70 upstream. This fixes the following warning, that is seen with gcc 5.1: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]. Signed-off-by: Tomer Barletz Signed-off-by: Takashi Iwai Signed-off-by: Arnd Bergmann --- sound/pci/oxygen/oxygen_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 5988e044c519..259bf54a9df0 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -88,7 +88,7 @@ static int dac_mute_put(struct snd_kcontrol *ctl, int changed; mutex_lock(&chip->mutex); - changed = !value->value.integer.value[0] != chip->dac_mute; + changed = (!value->value.integer.value[0]) != chip->dac_mute; if (changed) { chip->dac_mute = !value->value.integer.value[0]; chip->model.update_dac_mute(chip); From patchwork Fri May 5 19:46:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98679 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292745qge; Fri, 5 May 2017 12:48:28 -0700 (PDT) X-Received: by 10.98.194.199 with SMTP id w68mr18977143pfk.192.1494013708890; Fri, 05 May 2017 12:48:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.28; Fri, 05 May 2017 12:48:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755427AbdEETs0 (ORCPT + 6 others); Fri, 5 May 2017 15:48:26 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51105 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752456AbdEETsS (ORCPT ); Fri, 5 May 2017 15:48:18 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LrEhY-1e2r7w1MNA-0135pR; Fri, 05 May 2017 21:48:12 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Tejun Heo Subject: [PATCH 3.16-stable 24/87] ata: hpt366: fix constant cast warning Date: Fri, 5 May 2017 21:46:42 +0200 Message-Id: <20170505194745.3627137-25-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:BfBs9d8Rr65jPkR4vMfusdpckMW6U/JEFWdrmt5MQuTtv4Yaa69 HfDYHCdwEp58rWt3JT3Dtg2HbimRD3YxDNJqMSZgtHM5wCesYtrvU6cxJcd/nN3+3qeur21 wrGbjwpa5fVZ+j5yRkZF/cwyfeA45ZLGegeLnQGI3HWJpVauMwzqfDCpEV/AGiDFp1igZKs ECm2i1Mv+0xFhRI4cwZ+w== X-UI-Out-Filterresults: notjunk:1; V01:K0:xxfarrFVTHU=:x3629dp0l0T00uKcGIev1v B0SLLmBvEcsoKwzMPOFP4bMJXOHUd8EIhWe0MXHNekoi3eJr55ZNSyPkt8TbIpManI8YpSmBk gfp1gLGP9e5RQYJZVvcEnynRn4PE17mSHl76BbdQ+1B0jmruqFHcqWytKYdKN/0S04CuFpF4F d03Nu/UubAWjsmKWCWvTSF2VeyIVIPSrJuEUhpVXMaQfnCCvpn6tVpK8TjtaqqqYt8gIOjCIc odVObwnc4z46f3FZcF6rKsnFRER7pm8kAPbe0hM3BiPUUxkSrHRcpNumw8Jd5IIfDQ4mp0q7Y 6ikw+vOlOWq8GIWRXv2o8NdORMEeqvJVPl4flU8h/1tKk1QWY0HRBxfYtKUZKqzKyuy9RNkrs ES4E7wwkpPRyw6AV1PDTOoVQsHOge0SDYRj6B9XBv3ZVlYe2a+SPs8+YKlrfVe+aHpm43hLpV IXpkHNztaKT6UGnr8Nl3d7s8feaNNvybIuQN4L2EDmRc3b3pEXi9YuyOUTHTGzlfSHviGMPm4 eSepPAFjgmTC5I3uxPLsN2wj8UV4sKlYnQovXPbSuvbs0kOMr5XI5VExk+0APsAUM99J+3Nxj nJ0wTwlMoqNt+uv/6O9/ozkJJ8FOkr4o/xIecturKJrvYQbKIql4jng/x6AX3JOcxsRqse3AB Qs1HhWD7hb2yw7uK44qgypkPPAWHEIl0h73AfTmZ/JWGG74eCQxRWFepV9XvpYSoHfzc= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit c4c54a7b7dbf62ab1b15df88a23cbd0900b1bef3 upstream. gcc-5.x warns about a preexisting problem in the hpt36x pata driver: drivers/ata/pata_hpt366.c: In function 'hpt36x_init_one': drivers/ata/pata_hpt366.c:376:9: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers] Other ata drivers have the same problem, as ata_pci_bmdma_init_one takes a non-const pointer, and they solve it by using a cast to turn that pointer into a normal non-const pointer. I also tried to change the ata core code to make host->private_data a const pointer, but that quickly got out of hand, as some other drivers expect it to be writable, so I ended up using the same hack as the others here. Signed-off-by: Arnd Bergmann Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Tejun Heo Signed-off-by: Arnd Bergmann --- drivers/ata/pata_hpt366.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index cbc3de793d1d..0038dc4c06c7 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c @@ -352,7 +352,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) }; const struct ata_port_info *ppi[] = { &info_hpt366, NULL }; - void *hpriv = NULL; + const void *hpriv = NULL; u32 reg1; int rc; @@ -383,7 +383,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) break; } /* Now kick off ATA set up */ - return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, hpriv, 0); + return ata_pci_bmdma_init_one(dev, ppi, &hpt36x_sht, (void *)hpriv, 0); } #ifdef CONFIG_PM_SLEEP From patchwork Fri May 5 19:46:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98682 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292759qge; Fri, 5 May 2017 12:48:30 -0700 (PDT) X-Received: by 10.84.247.9 with SMTP id n9mr65810881pll.119.1494013710219; Fri, 05 May 2017 12:48:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.30; Fri, 05 May 2017 12:48:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755535AbdEETs2 (ORCPT + 6 others); Fri, 5 May 2017 15:48:28 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:53476 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754324AbdEETsY (ORCPT ); Fri, 5 May 2017 15:48:24 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MFljh-1dJ7GL2cZp-00Eg4e; Fri, 05 May 2017 21:48:12 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Rob Herring , Mike Turquette , Arnd Bergmann Subject: [PATCH 3.16-stable 25/87] clk/efm32gg: fix dt init prototype Date: Fri, 5 May 2017 21:46:43 +0200 Message-Id: <20170505194745.3627137-26-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:s6I1RMKtHvF1AAGySVkJVGDHw/xpOE5t/oFqe6FTTvbV4GtMgbE uCm4XU4GPE3A6OrChRyO076lJpw+xRXbVdatBtfDmoEupsXMU9EWsWBYcrLDjtiAQP/3EaN wc73JWA8biCBdFUuuDoCOZ67uVTNN+1SaFg00SCJZWU0w6lkMIrg1WpNWu8SQIgrs8O34kq oI4551heYvf0f0WotAEXw== X-UI-Out-Filterresults: notjunk:1; V01:K0:5d9OMihyWg0=:fD1UPbdkmXMTIQvCxnMcFJ 22uZq+IKgZweaSQhshSyiCjHDPhnm3CUgvvPetHV1DwpJJTZrV0+LX+ziH0KJQeNnsUfqhimY BUEbr/109HQzz41yPzCfz1JSnNaFeuM/TuSPb9XR8zRAU2PY2qktdxRgm1znAzAcie//itVzx Wsfw2nzCBmqmTAEKD10qVcexmFSVcmXTxhhDeXQHSeD62pcl9cxvmfRawN8jLN26xmENcknQ1 9dSj5l0oLvRsA7xAt0Zg/AqX2D2vW65nW4Q3NRahKYF2X9TIFWxMujaE05g5OXIE+PKKX+6eB 4GaMlsb9QQ+MyJEPNWP7HOXKD5T6G8ex6jk4NqN0fS9ozr0z7bruMnogZtNX/eYp3SMiePy79 Qsz3oD5AcBeJJ/ATPgssPGPaC4oESgC0+rXU3XOcRYx40sdLOQVz1B0HukoaHuydbfJWqOfRt z4q5Ge7Xe4eX0VqxTqnFZNHnF/wsukMNCLCw0wKExh2ORa1R/JgmNaaK+I+EWC6XGoiGGcDKb mBCPA8rds8fEggx+PfBA2SjCPqH4ENNTPDZFr/h1/cmDh9TRjWijvQUNrC63QgGUr4Kny1GqN 4s22W8QrJWRTWgZjg5UJtitEfIY+423ZJ0wWT/wAMrhWOmn3i09iEXjJuxbY9QQLG1B7VUZED tAZhasMQL0TpigkfQt53dJEdB9ecKxw1yDqFBJ9f7M7f/K5RhQay4MlxQe3T69302U1v7DEZz /RobDyoxNhJ7i5Hh Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Uwe Kleine-König Commit 34bac750ed6f7a87fe6ea0f1d7b000391ae08698 upstream. Since commit 54196ccbe0ba (of: consolidate linker section OF match table declarations) which went into 3.16-rc1 the following compiler warning is generated: In file included from drivers/clk/clk-efm32gg.c:12:0: include/linux/of.h:772:20: warning: comparison of distinct pointer types lacks a cast [enabled by default] .data = (fn == (fn_type)NULL) ? fn : fn } ^ include/linux/of.h:785:3: note: in expansion of macro '_OF_DECLARE' _OF_DECLARE(table, name, compat, fn, of_init_fn_1) ^ include/linux/clk-provider.h:545:42: note: in expansion of macro 'OF_DECLARE_1' #define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn) ^ drivers/clk/clk-efm32gg.c:81:1: note: in expansion of macro 'CLK_OF_DECLARE' CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init); ^ Fix it by making efm32gg_cmu_init return void. Cc: Rob Herring Reported-by: Bryan Hundven Reviewed-by: Arnd Bergmann Signed-off-by: Uwe Kleine-König Signed-off-by: Mike Turquette Signed-off-by: Arnd Bergmann --- drivers/clk/clk-efm32gg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/clk/clk-efm32gg.c b/drivers/clk/clk-efm32gg.c index bac2ddf49d02..73a8d0ff530c 100644 --- a/drivers/clk/clk-efm32gg.c +++ b/drivers/clk/clk-efm32gg.c @@ -22,7 +22,7 @@ static struct clk_onecell_data clk_data = { .clk_num = ARRAY_SIZE(clk), }; -static int __init efm32gg_cmu_init(struct device_node *np) +static void __init efm32gg_cmu_init(struct device_node *np) { int i; void __iomem *base; @@ -33,7 +33,7 @@ static int __init efm32gg_cmu_init(struct device_node *np) base = of_iomap(np, 0); if (!base) { pr_warn("Failed to map address range for efm32gg,cmu node\n"); - return -EADDRNOTAVAIL; + return; } clk[clk_HFXO] = clk_register_fixed_rate(NULL, "HFXO", NULL, @@ -76,6 +76,6 @@ static int __init efm32gg_cmu_init(struct device_node *np) clk[clk_HFPERCLKDAC0] = clk_register_gate(NULL, "HFPERCLK.DAC0", "HFXO", 0, base + CMU_HFPERCLKEN0, 17, 0, NULL); - return of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); } CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init); From patchwork Fri May 5 19:46:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98675 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292725qge; Fri, 5 May 2017 12:48:26 -0700 (PDT) X-Received: by 10.98.130.196 with SMTP id w187mr17369474pfd.12.1494013705989; Fri, 05 May 2017 12:48:25 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.25; Fri, 05 May 2017 12:48:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755323AbdEETsY (ORCPT + 6 others); Fri, 5 May 2017 15:48:24 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:58359 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755324AbdEETsQ (ORCPT ); Fri, 5 May 2017 15:48:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXz6t-1dbC4w04MJ-00Wl9m; Fri, 05 May 2017 21:48:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Geert Uytterhoeven , Geert Uytterhoeven , Mark Brown , Arnd Bergmann Subject: [PATCH 3.16-stable 26/87] spi: rspi: Remove unused variable in rspi_rz_transfer_one() Date: Fri, 5 May 2017 21:46:44 +0200 Message-Id: <20170505194745.3627137-27-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:A6JNbzJ1JFAhiuAKfpsO8vnPBtZOgU1bUdujCoMQiEVZjWgQJyq LoyaG6JNsXNszUA32s8NNKDeIOxbnkqrdLlDkxrsNrq2Hr/rSpdMGIcg2ctTPuZf7pmkJje tykRKIm4Vf/KwVFacKwtbcsjn6bWI+X9oXmUVoKZrchOJLr+DqflekcDk2fLNs9bx5VO3nD HKSJOIVW7ImP10/S8ELOA== X-UI-Out-Filterresults: notjunk:1; V01:K0:RMoYoZMd6BU=:fgh8CEQbYyQU3nTcKk1qTc +nWD4A/QM/ZkfZHZAIKD6k1pSWmd2vA3EPW9JX3l9SpnifKgptYMxAXgQXQ9AuZOzyONJRl7h fLViuDAU40n8cVIdJuvtpKkIwPO4bX3ElY04pdb8tlUWqq0a/QwF8VB45NHz3s9Tb+7jHI8He yGt0ykLh23OT30Im95tDPW1JsdYrY5TH5/iB1iXVAaDiL641qqFC3SKXtwrPlzQsQpNaSWG+a aV0LoYB00GCzeX44rGrZiInHbyPVNt5MQd2OcjkL972s/Hpkxr2AoyD9fRRzCmGynEt41sbxl s1wARzROgbDYYdpg9Eo9nYia+xA9W856CFZ9E17LAneLai0b5dd6OTVmLq9+Oj6lu+Lge3v9Q sfSsd5Qp2KOR9VB01UoIom7GpYeQ3ZFIeXlUZsL1ub1FdqVjbY6G9+Ww4kEe4yhGfLb/c2J+t 6z/V8YAeUMD5kc1ERQthXK5bAC3BlV9wJB+otzw8ZwpkIaz9FqyYfhV2vulaDdyd8K8D2PtPW kQFXqb9cFG/+3ZoEFEYKgIrvv/O60K0MAdhhPW1ZIsupwWnVDFYSVyZASVOW3QRPRVW6CGUov tCiQemvvjas3xgrndQXkNN0WIDftI2RCSttqt/97yx9N5I8TgIht/xLfhm3yrJ9lNlI162z0w ccFgni/qiTZ/cfbnzDrlqqh7zqIloyK637hvJfpxAmfSYavgqhx4dFwUe75nLt8AnQc0= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Geert Uytterhoeven Commit d11e5dbf9a0edea96635c17fd0498a18fcf5fe40 upstream. Introduced by commit 8b983e90ea1a3dd82070f96c062ad521a06b7cc0 ("spi: rspi: Extract rspi_common_transfer()"), which removed its users. Signed-off-by: Geert Uytterhoeven Signed-off-by: Mark Brown Signed-off-by: Arnd Bergmann --- drivers/spi/spi-rspi.c | 1 - 1 file changed, 1 deletion(-) -- 2.9.0 diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 10112745bb17..ddee9df1547d 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -630,7 +630,6 @@ static int rspi_rz_transfer_one(struct spi_master *master, struct spi_transfer *xfer) { struct rspi_data *rspi = spi_master_get_devdata(master); - int ret; rspi_rz_receive_init(rspi); From patchwork Fri May 5 19:46:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98672 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292719qge; Fri, 5 May 2017 12:48:24 -0700 (PDT) X-Received: by 10.84.230.135 with SMTP id e7mr68498634plk.20.1494013704173; Fri, 05 May 2017 12:48:24 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.23; Fri, 05 May 2017 12:48:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754699AbdEETsW (ORCPT + 6 others); Fri, 5 May 2017 15:48:22 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52895 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755462AbdEETsP (ORCPT ); Fri, 5 May 2017 15:48:15 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M0Y5m-1duZP91FAk-00uoN9; Fri, 05 May 2017 21:48:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Arnd Bergmann Subject: [PATCH 3.16-stable 27/87] spi/atmel: Fix pointer to int conversion warnings on 64 bit builds Date: Fri, 5 May 2017 21:46:45 +0200 Message-Id: <20170505194745.3627137-28-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:K2TosddJEh/y0+JRKdfrBsWsgHjYMdNmBeGdKnq2ZUGEqWp7LBH mIybhYd4ro823CVFp80eBI+xiq1reczmNBE+YK4J04AkyjnPDnt7Qvw52WMgl3GBXwEsdST jJbcRCu0omqnj+R3NejkrVSGomocxO7RNb098rFGc3hGdrBxBRHHD0pJTM2M4mNTO2jNYoV DJ+cjA5OL9D1sMjW1uJew== X-UI-Out-Filterresults: notjunk:1; V01:K0:FR48xi9lfZA=:QNNLmRnSMMFlkb0wLMZyBj Os56cXEWGxyFzIvOzi9YHGy7/x2orR4AwMz97jPkM+vzk1RpeFXAYm+jf9K6UizhRJtZn8Ziu UndWt+isbiJfqlBPZ2fUztoHylWalU4yL+VyBBYPEN+BLroLCqSWUy39v/TxC7aWVbaPVlc0z YaIszJafCP82DiY/nYDsmJYK7gZXNjfwLWIJDlwcG3CwzRgKm4zh9U0VLrspQki722KAa2vdn uxSxLl2w6VqS2JXs6SkDntMwb1/o7TOcJhhbw4T/NC9a0hkGFnBpsO046IVYipOkj7vzorZ61 oOQnRRbkdNLihc1jnl+t/KdbZdQWu98wOXJagTptfhgC3cnP4Ft3o62B326A1PtvcChTQf2PM wKrFb7QRVQxHmGjcZ2T13oxJx/kXMb3fPIQrUDQeTjmOFQ7SYv9SgkbYJSgu5dBZrKSYHaTj4 EULG39+ZD40odm8bTQy7auV6k3ix7OjTk37bJ3I8MW4ie/ESd0X2KhTFq5iEdZcc4uOegh1jc fBQ7x0TP6UyzuVZpQlxG3LPs/6wVR+UhgFXyVA6xJWJAOH70jfxdZWHthaTbKTZLY1wXaZHxe fDhHJQzc82MPZ+vYCMrS0Ju1iLLh5nW8WNgt8oudgDEVZAvcro7y8FGUsT5WWUtbSDE14kv5A fnPbtGOyl9MnrNI/kN/cZ/4fK/5rddJsmImqvQoYGLrafP4jpWy/PEXN8FJnfMGvkswk= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown Commit bc0795f5cac166cb6df30508cb0af37975cf38f8 upstream. On 64 bit systems integers are generally still 32 bit but long values and pointers are usually 64 bit. GCC warns when casting a 64 bit pointer into a 32 bit integer so cast to a long instead in order to avoid warnings. Signed-off-by: Mark Brown Signed-off-by: Arnd Bergmann --- drivers/spi/spi-atmel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index bbf7c5e79b95..907649913557 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1019,7 +1019,7 @@ static int atmel_spi_setup(struct spi_device *spi) csr |= SPI_BF(DLYBCT, 0); /* chipselect must have been muxed as GPIO (e.g. in board setup) */ - npcs_pin = (unsigned int)spi->controller_data; + npcs_pin = (unsigned long)spi->controller_data; if (gpio_is_valid(spi->cs_gpio)) npcs_pin = spi->cs_gpio; @@ -1254,7 +1254,7 @@ msg_done: static void atmel_spi_cleanup(struct spi_device *spi) { struct atmel_spi_device *asd = spi->controller_state; - unsigned gpio = (unsigned) spi->controller_data; + unsigned gpio = (unsigned long) spi->controller_data; if (!asd) return; From patchwork Fri May 5 19:46:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98669 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292711qge; Fri, 5 May 2017 12:48:22 -0700 (PDT) X-Received: by 10.99.0.3 with SMTP id 3mr5271815pga.57.1494013702732; Fri, 05 May 2017 12:48:22 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.22; Fri, 05 May 2017 12:48:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755468AbdEETsU (ORCPT + 6 others); Fri, 5 May 2017 15:48:20 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51418 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755464AbdEETsQ (ORCPT ); Fri, 5 May 2017 15:48:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lghtu-1dsRoZ2Kd4-00oI0Z; Fri, 05 May 2017 21:48:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Arnd Bergmann Subject: [PATCH 3.16-stable 28/87] spi/pl022: Explicitly truncate large bitmask Date: Fri, 5 May 2017 21:46:46 +0200 Message-Id: <20170505194745.3627137-29-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:ZmpkB/MNs93e5twR32nR/tTEl3gh5mpzvE/11ry/LjaQLEeFp1j At7qCURt9UWTvOro/qa5RN8e5pAr9mlwOXkPO0A5RTxTpKRVS0xgN50A3cpehlE22e4po50 lX1JX9HThZnyxn/0tC9Lx/Yg1VwNrIh2xDaZTh8XfEwQ7jt5Mr9gBeaiiwWedD1rN3Oie3r kaFWWY1BVp9lEEbxzOGmg== X-UI-Out-Filterresults: notjunk:1; V01:K0:M0QOqy6XbqI=:niA7luB5vu7NII/Ka7YA+R CI3cWrXysvatmnrodd8heZEbtUWn9dRAR1SE77hHgvEp3nFlEqcl7dB5dumgzSRs/pNPSm3RO ZOts5cf6P6tAKSPGPfJSToAif5rIyYhStM4IZYMrR87loueeF7bHoJi645FYX6slmQKETNEIO X+5zXhtI6OcZYSkBvfmfEwavMBKiwjbc+ui+82S49TOFmauO3V1oUWQvlf1n6dkvrfssCcuWP kWDib6YcBoAC9up86SVcjwUGRJ04cHNGy7tE/P8KN/57xOUsEnTj4YeUVeC94GiJT0GSiKvOw 6WYsUXnblC6PnwzsUKr6Q66U9b1PejFiQ67xXBPNJBmrTWTUDKmNh9CJu7CJWG7k+8IIQ+rZh byltA7RZKt5hECMI+KGz7gt3T2mSUYQjXEowoYsw8HCkYyNXINIzSdWdcSXubSE92Y6CpC/2H APMqCrC1liPGmEqA6VuHNuI3nCJ+Re5U3vePBaE1tE0a/le0TethKwXTBcJqYp52XOflgdYBS gUxdQCM/NFyLP7GNJmckq/GZZ9KcNFgVSrmcqlO/41/LdMny/oEKPtdLKpYFBuEhbmlN3YwAu HZrYyXr4aw+nxcoc94GBOPoNMQEfB8mUQSnfyL73zUYJadk7MDWpSn9zk+ESyrf39YAjh7xal mnRAAuDzbSK0FPUuTnreMmSJiIEdhhcVrfg+S5cRIEq0IKF9bXGQTFJMHBnjJDMECpxQ= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown Commit 41b5da6383a72732f9facd2e03873c481baacb6e upstream. When building on 64 bit architectures the use of bitwise negation generates constants larger than 32 bits which won't fit in u32s used to represent 32 bit register values on the device. Explicitly cast to let the compiler know that the higher bits are not significant and can be discarded. Signed-off-by: Mark Brown Signed-off-by: Arnd Bergmann --- drivers/spi/spi-pl022.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 02798036df8f..53a908e4219f 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -1417,7 +1417,7 @@ static void do_interrupt_dma_transfer(struct pl022 *pl022) * Default is to enable all interrupts except RX - * this will be enabled once TX is complete */ - u32 irqflags = ENABLE_ALL_INTERRUPTS & ~SSP_IMSC_MASK_RXIM; + u32 irqflags = (u32)(ENABLE_ALL_INTERRUPTS & ~SSP_IMSC_MASK_RXIM); /* Enable target chip, if not already active */ if (!pl022->next_msg_cs_active) From patchwork Fri May 5 19:46:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98671 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292714qge; Fri, 5 May 2017 12:48:23 -0700 (PDT) X-Received: by 10.98.75.6 with SMTP id y6mr12273241pfa.157.1494013703892; Fri, 05 May 2017 12:48:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.23; Fri, 05 May 2017 12:48:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752409AbdEETsV (ORCPT + 6 others); Fri, 5 May 2017 15:48:21 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:61402 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754699AbdEETsQ (ORCPT ); Fri, 5 May 2017 15:48:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MdzeH-1dPcZ63S05-00Pa9w; Fri, 05 May 2017 21:48:13 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 29/87] tty: nozomi: avoid a harmless gcc warning Date: Fri, 5 May 2017 21:46:47 +0200 Message-Id: <20170505194745.3627137-30-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:RGXyhYII32KydToPKBBF/kk3tAKKglaZ3sx6QuwtNuSgB0tiHca yzXCTIIB/QwFqZNlbHHKpfaTgrhy+mObPYI6zgB9W9kVhKmiT6zMy8wDfzOWntcVdDitc+a 0wiG+gxKelzj3qEnMPFk18PfcDGLBJ14g5xCJGEeiaMmSkhTKz1fhyux0CeGQztSkE/7omE PKhsjvlPbtZA553UB/A+w== X-UI-Out-Filterresults: notjunk:1; V01:K0:tGoGCKseEcQ=:qmB0kDZPn0s+2bvLXtDy1T qGkYQKnfBK6sRaBmL4MWipHY1dPmk2pFq2er/kbdyro3BD+gzjC3MvwJGkuKYItTmSjJgCvs8 WGzzgzSmau17tu5xQglPRZQw6loh3avqzHlnkpiLdmE7Rmh0tiqKdLfxLa4Klg9/r5QldBRIt 4KdMF8lPxKYJoFAndbn3uiAAAhDEfQ6Irfa05h/Ixbp4BLQt6Dl0iPo1heRJpNotcJlUHQufV MXZA1XYT0rKL9FvasNPKb9rc40sqvg/WgYWXSEIWeUYyUSMXjPuKoHTGFaKkjDqoK0LiOsAWu cCFNs8ggpCFigsovBADMUL+AM/8TbGLdO/5+8IVhh4818kDBw5QqZ9HUcZMkYgHNj3dwlbmTX 0syjZwX8xUXw8s8AKlhoqXbR8vrPNnA5N88PbVvCs8IL2fQz3qQBI/bbXChctwwjN4UTMUnl5 nw4tfmmeyRsCLbGMtTtDR6xFzmfcWZ5z4q6E2Gl4UyxgcSc0nucMOXzkU0s2Sq5NdAs117UP4 1pYFLnexqzIzb0TkrXHfqQwL3qkJkvQ2H9uHAulSrdnlI2eOFN5mJ6QMwZieICvXmucFkvNiZ /VcCCmA2bEqMyTTPUEnvAKc5FuL7/HSfj8b8NuHDBDjDjddH25XHMl/KWcuj1ELmpChLNu6Od wUOTTvB+xfwgNYdBNG19z7hToQuPtIOMPb7d457wM+RJJvm/BgYv5b7sbnBuS/etuLE4= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 12ad7e7221c80094be100a0e564f0d65775017dc upstream. The nozomi wireless data driver has its own helper function to transfer data from a FIFO, doing an extra byte swap on big-endian architectures, presumably to bring the data back into byte-serial order after readw() or readl() perform their implicit byteswap. This helper function is used in the receive_data() function to first read the length into a 32-bit variable, which causes a compile-time warning: drivers/tty/nozomi.c: In function 'receive_data': drivers/tty/nozomi.c:857:9: warning: 'size' may be used uninitialized in this function [-Wmaybe-uninitialized] The problem is that gcc is unsure whether the data was actually read or not. We know that it is at this point, so we can replace it with a single readl() to shut up that warning. I am leaving the byteswap in there, to preserve the existing behavior, even though this seems fishy: Reading the length of the data into a cpu-endian variable should normally not use a second byteswap on big-endian systems, unless the hardware is aware of the CPU endianess. There appears to be a lot more confusion about endianess in this driver, so it probably has not worked on big-endian systems in a long time, if ever, and I have no way to test it. It's well possible that this driver has not been used by anyone in a while, the last patch that looks like it was tested on the hardware is from 2008. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/tty/nozomi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index cd0429369557..b5b1b195ff2c 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c @@ -823,7 +823,7 @@ static int receive_data(enum port_type index, struct nozomi *dc) struct tty_struct *tty = tty_port_tty_get(&port->port); int i, ret; - read_mem32((u32 *) &size, addr, 4); + size = __le32_to_cpu(readl(addr)); /* DBG1( "%d bytes port: %d", size, index); */ if (tty && test_bit(TTY_THROTTLED, &tty->flags)) { From patchwork Fri May 5 19:46:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98667 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292695qge; Fri, 5 May 2017 12:48:21 -0700 (PDT) X-Received: by 10.99.1.198 with SMTP id 189mr5347598pgb.229.1494013701036; Fri, 05 May 2017 12:48:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013701; cv=none; d=google.com; s=arc-20160816; b=MQ1OxsjSnVS0yRGs8QDN8KOfrqqQNqRtt8EgZL205luOxqeECLANE0Z0xQRjbuESEw kwXH9pq9jBNmEg7tfoxngTDwwSVhMgHva1O/jzYHRLWJtzXnLnoK4PZofaYQQfuta9Ij JD60KxsNT7KxNiD+87cQUMJ/EoGGvk0GvDKJszrKdvVKqIJjtZcSCGfg/hban5YzG8U0 JGSVCKhbeoIwF1Wgm6Y5AE3YX2Abt1EwnmB2x5WmedVSFW+x0bQdYlF5z2ViirDZ9Swi /QHLyjspwWrivZlpyj39W3wYhXsNFQrQAbvfC7typ4EgSCtnKKajOnE36EfrctifFwi5 +4pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=lvJFJfkFJw1XtqcV0w1Z/YbFiNAT76ydpT/T1xW3vJQ=; b=HlxfLay+wKMcm8wJsAhJssUd0qO7sw9QFcxeV7UlO3+A+Vgtpkl7TP93Xt0qWp82ub phMsSYTDUTJKI/6TbPEePJwPE5dFJ38NvCkhr5KIJrJmoOAkGibvWnq4smUlWYF0L0/k nvP8gxMhSoQ4NTIC9c1yWlOF6AykIPzS6KPptnA+wWnJQ7ACiHMnEhkWlDNJ0g+R/d5R kx0oDc5wIzWMrUwHGmQRrJ6D7SuYAAk801jQskeCpeGT6mq71ZYg7gWJzTQLGFjEOi5e AUrP4ti7qk4AZrYxYckzkvNgwOLGexjcmiGxw9dkTkhq62X4F6fe4HaEQY0VHyLQaMPj DLyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.20; Fri, 05 May 2017 12:48:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755501AbdEETsT (ORCPT + 6 others); Fri, 5 May 2017 15:48:19 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:56758 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755323AbdEETsQ (ORCPT ); Fri, 5 May 2017 15:48:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M4Nqe-1dyP9W0CZo-00ydrV; Fri, 05 May 2017 21:48:14 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 30/87] tty/isicom: fix big-endian compile warning Date: Fri, 5 May 2017 21:46:48 +0200 Message-Id: <20170505194745.3627137-31-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:zTd0Wv11wMH7M2GxRuPRvVhI7zcNK1UBQncrwhAqTKr0Rz7Xr5q x5i1QD/o1mAboKAK4kc9gN1CYg9KfYqa0dz0KBwXBMVv/bPMonnKnBdTo/UhIoMOpRm7qSV ZErlPm6dJpnW1/sY1NZHShJ+/VfJan8kxFjMTvvkNLdftM2wDKqZd84DcWsdn1sL08fJEoY 9rqx08UqReQMySb4tbqfA== X-UI-Out-Filterresults: notjunk:1; V01:K0:QuOzAM8f6Kk=:IcWvjcOvgOrhANDw9zUBsP czlrDNid7LHu6WMJRHo6rCFrpWG2eBGeCxxYIO2BkeUrWGsHvSvYor4BzzKD0yYfLFUJOD9cf B7X4K9O1805EjQHsUzMGUp+ijzD65f8Tq17JtYQZJPq01cWuJ79e6pWzGtexP8Vmqd0UkwKwg NUtP86/WZ/9aer2N9+W75TnM/2VGIRQvCNI7VWYEAiFIinfovmFrxsSGGcyr04CdYmOAfh0gP 7fMJF9vpJTDgLMH/WlpHvPwSV6Zct/fmCZ35QuiYzyAzyJxZETO/hYqArTRRVTx8MFR+I4BJn 83sVYBi8zvMjedED33j23RqlBShVpE8JPUQvSIOKjd7bZORM5hGhyQk0Y/hEjIZClCVuN2nB4 rKwMVKo1eV5Au6g9LyL7BVtfqPbnvbP3k+O7PR7taB+iAhwSAhrd+DIe9bn5+xz49ZM0SCKfW Fone3XkETv8Jav/7j+DWg/W3QqhCMM5c6ivLRQ++35EqXznfjNVqbvzTGAYsuutbQi2wDWcNl iXliw4Loj3mbjs3YutP6n65JlYHhr4VIizMUHRgYRizcXir1wpmnKP/jBjT76ySGdsn0ggqqZ IdLwuzzEmwz2kTiPIL3DpC3w1oAJBhNxtFWIwvx+PS6sGBnDsm9B/kuzRZ5rdCL4ewi9SlyWq XmLh0xxp/MQW1VQbx7uCdMArWCfWjB8gYXuciNzCs9bJIdnV/qtGmWeEG/rRX/kGHnns= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit f3e2d56dce47dbd0bb3f69f84741b439542fef37 upstream. Building an arm allmodconfig kernel triggers a lengthy but harmless warning in the isicom driver: drvers/tty/isicom.c: In function 'isicom_send_break': uapi/linux/swab.h:13:15: warning: integer overflow in expression [-Woverflow] (((__u16)(x) & (__u16)0x00ffU) << 8) | \ ^ uapi/linux/swab.h:107:2: note: in expansion of macro '___constant_swab16' ___constant_swab16(x) : \ ^ uapi/linux/byteorder/big_endian.h:34:43: note: in expansion of macro '__swab16' #define __cpu_to_le16(x) ((__force __le16)__swab16((x))) ^ linux/byteorder/generic.h:89:21: note: in expansion of macro '__cpu_to_le16' #define cpu_to_le16 __cpu_to_le16 ^ include/asm/io.h:270:6: note: in expansion of macro 'cpu_to_le16' cpu_to_le16(v),__io(p)); }) ^ drivers/tty/isicom.c:1058:2: note: in expansion of macro 'outw' outw((length & 0xff00), base); ^ Apparently, the problem is related to the fact that the value 0xff00, when used as a 16-bit number, is negative and passed into bitwise operands of the generic byte swapping code. Marking the input argument as unsigned in both technically correct and avoids the warning. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/tty/isicom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c index 858291ca889c..c03ecaa0af7f 100644 --- a/drivers/tty/isicom.c +++ b/drivers/tty/isicom.c @@ -1055,7 +1055,7 @@ static int isicom_send_break(struct tty_struct *tty, int length) outw(0x8000 | ((port->channel) << (card->shift_count)) | 0x3, base); outw((length & 0xff) << 8 | 0x00, base); - outw((length & 0xff00), base); + outw((length & 0xff00u), base); InterruptTheCard(base); unlock_card(card); From patchwork Fri May 5 19:46:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98668 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292701qge; Fri, 5 May 2017 12:48:21 -0700 (PDT) X-Received: by 10.84.225.130 with SMTP id u2mr31875767plj.91.1494013701317; Fri, 05 May 2017 12:48:21 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.21; Fri, 05 May 2017 12:48:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755519AbdEETsU (ORCPT + 6 others); Fri, 5 May 2017 15:48:20 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:63858 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755468AbdEETsQ (ORCPT ); Fri, 5 May 2017 15:48:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ltibd-1e5K6V11ev-011A1Q; Fri, 05 May 2017 21:48:14 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 31/87] i2o: hide unsafe ioctl on 64-bit Date: Fri, 5 May 2017 21:46:49 +0200 Message-Id: <20170505194745.3627137-32-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:7+/nzQDXeL+Cew5WEfGT1W44ZJ81EjJKzaXETW2nPZmLPf+v1Kn YVZSQPtfj5+dTj5aicoPHPGckEYJ6SQlxYeQme4WNRtp17Pc3VqAOhBtPIND+jNnT9QJFRz EDjZWXdjVHOdYD7Nmp/O14RYghKGe604VI2oF/GqXlJtf0Cy5Mr0FlRWieu0RTzGPsMABfr jBxVeBZ6zvvI/m9GXr4eQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:V92gxxYaAVA=:imL1q5DxexwnWanP+Gav/G WgQh41j8pYF1JlD1YDmD6R2JyEYnjSQmXF7FBAAK7RPkedUH0ZFk2uEmJ4yNIs0MjbIT96IXN z8CIMuyoBnyltzclYdpHGohJonXYvNa/5CxJtxxxU/RUkdtCGbk65Gdi7YeXfvaIp6t0Z4252 5UUKIhdsgPnYlO2Ts5T6tq9BsMZp9uPQ/NCsQBQXESdssYw57hywHnF5ibuNGxTLqJ3SmmnsC G7jLsx/RKIAbWpM3JcpxOZXSif4elUkjb6NuNcw31b6Rxj4QrrqbTo26oH1bHKICArDUiIhKJ aMGhY5gLvQNouz7YS9JpE3X0CVkN4QUCBwxJmD5ZJc98SuY8inOqGmxMq/V8Z0sXluhAzmqdv IOwwdHm3LXH3JCb6NaZqi6uChH4VbRQMmfyU7fHaCF4r4NkvGGGgGqbUXqm2JrqpYkrjzu1WA lWAP219ZJHTPpaq7PGGFRzmJC1SK3SbJqp5/gSvlOXpH+b6zWABYztNiCjEn8PbhqF+9D8JFM modKA0sdwraDfkO46IXZ8bINrBv8BxSdvEELGpaeje+dFAdKERQZacY6EO9BdzLXInppzwA40 TCgyMdODYTeAX6aSjdZWFXgvhy0/vSTX0S3434P/jsOpv63PkTCdU9LxPZiGFhAbhXPweGsZJ J7jnbAHbUuS0jZMYOR7IZz9lUokoqF8sCyyZ+wdak0MjSP4TRlttpTs4ywWrj/jvsycQ= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org We get a warning about a broken pointer conversion on 64-bit architectures: drivers/message/i2o/i2o_config.c: In function 'i2o_cfg_passthru': drivers/message/i2o/i2o_config.c:893:19: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] (p->virt, (void __user *)sg[i].addr_bus, ^ drivers/message/i2o/i2o_config.c:953:10: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] ((void __user *)sg[j].addr_bus, sg_list[j].virt, ^ This has clearly never worked right, so we can add an #ifdef around the code. The driver was moved to staging in linux-4.0 and finally removed in 4.2, so upstream does not have a fix for it. The driver originally got this mostly right, though probably by accident. Fixes: f4c2c15b930b ("[PATCH] Convert i2o to compat_ioctl") Signed-off-by: Arnd Bergmann --- drivers/message/i2o/i2o_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 04bd3b6de401..67ceb3010a10 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c @@ -772,7 +772,7 @@ static long i2o_cfg_compat_ioctl(struct file *file, unsigned cmd, #endif -#ifdef CONFIG_I2O_EXT_ADAPTEC +#if defined(CONFIG_I2O_EXT_ADAPTEC) && !defined(CONFIG_64BIT) static int i2o_cfg_passthru(unsigned long arg) { struct i2o_cmd_passthru __user *cmd = @@ -1045,7 +1045,7 @@ static long i2o_cfg_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) ret = i2o_cfg_evt_get(arg, fp); break; -#ifdef CONFIG_I2O_EXT_ADAPTEC +#if defined(CONFIG_I2O_EXT_ADAPTEC) && !defined(CONFIG_64BIT) case I2OPASSTHRU: ret = i2o_cfg_passthru(arg); break; From patchwork Fri May 5 19:46:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98678 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292732qge; Fri, 5 May 2017 12:48:27 -0700 (PDT) X-Received: by 10.98.155.28 with SMTP id r28mr18356040pfd.198.1494013706534; Fri, 05 May 2017 12:48:26 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.26; Fri, 05 May 2017 12:48:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755309AbdEETsZ (ORCPT + 6 others); Fri, 5 May 2017 15:48:25 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:52928 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755479AbdEETsQ (ORCPT ); Fri, 5 May 2017 15:48:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MFljh-1dJ7GN1tUT-00Eg4e; Fri, 05 May 2017 21:48:14 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 32/87] dm bufio: hide bogus warning Date: Fri, 5 May 2017 21:46:50 +0200 Message-Id: <20170505194745.3627137-33-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:tcysIQgZiHTQu9jOp26wUUQQQvZi/8/g+IeYuD3zWJmJX+FLcHN 5oYEZXqEEkTz7+QeXZbv9qQhGyjxVn6ip6OQ2svRUQRT1tLzJImmOwS0eBYgJ4aqWsEi9LC 3YRaQi+GTG3tidIxdjyDtDIfkJMiaASkYSG1Huds1ODPCeiMrf8opWPGYFARIr1YxCeW04U EPJv2DKEz98QxSDRucozg== X-UI-Out-Filterresults: notjunk:1; V01:K0:ysOJejACqp8=:lKnwi3stwEtQr6cFNTxClb SVGlVSjmhc1FYzMrCzCqmZHzRptfh6Fqi7IyrZRa78l1vFZvZxFUK7xZH4v2jVLum6k+vDZxK 5np2IKiVWZm4tmL0Hg+beWaAKxJd2DFsIaMVh6i/eF7nhACs6RQWPSO6eROW7uZqqDJAh62NL GeFVUc7SZ7H8JDZ+C0H7WKw8TZUM+vjSlMtb1/N+gx8S/NgKr/IjlvfDa22IQjhJFQ7X1tlDV zIYteGaNzR60YgQWNNRWlEjx4kDL+dWi2w0gRawjL2IctB6ZMDmDaqntlv85TOgavinxX6x7z dTZcqJ/jqfncHPrW3n6WTFNLQN1ltRXYhf0lrvaU8v0/8Sl4uMPqiMKsedRM3n0a5x+A7sTAm tYAEfty3O6UAPUrCY7evi37Q112cg+KumR+n/TsXDrxoJJEIjm3HofX/LYD5mDW3lWNx8hGmz VtSTa5YFIZaB8WEUXpBBM4gLEGThtozs0iB+d9qc7qBNd09tqH/r42XPJX2wKzjmrpoXu6Wit f6+pektVDaONEGy8faI2zICIwktYZFlo5erncCmK892BcqrqcBKXtllRUYNMmsB2bFal//LzJ BZ8Z1cNA6kV0P6u/Dp/2xWpEqoVtCugqADSNYHamfW3J2xvFxKNUOKplrdBoMP3Z1DD9FI7cz YbA8At5xbbyr8tUs1Z1oyNBSRe+iux4e7e/l3x7BD42iu9erFzyeobDv6EYny475gfAk= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org mips-gcc-5.3 warns about correct code on linux-3.18 and earlier: In file included from ../include/linux/blkdev.h:4:0, from ../drivers/md/dm-bufio.h:12, from ../drivers/md/dm-bufio.c:9: ../drivers/md/dm-bufio.c: In function 'alloc_buffer': ../include/linux/sched.h:1975:56: warning: 'noio_flag' may be used uninitialized in this function [-Wmaybe-uninitialized] current->flags = (current->flags & ~PF_MEMALLOC_NOIO) | flags; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ ../drivers/md/dm-bufio.c:325:11: note: 'noio_flag' was declared here The warning disappeared on later kernels with this commit: be0c37c985ed ("MIPS: Rearrange PTE bits into fixed positions.") I assume this only happened because it changed some inlining decisions. On 3.18.y, we can shut up the warning by adding an extra initialization. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-bufio.c | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c index 4d1edcf552bb..3711ca2a709e 100644 --- a/drivers/md/dm-bufio.c +++ b/drivers/md/dm-bufio.c @@ -349,6 +349,7 @@ static void *alloc_buffer_data(struct dm_bufio_client *c, gfp_t gfp_mask, * as if GFP_NOIO was specified. */ + noio_flag = 0; if (gfp_mask & __GFP_NORETRY) noio_flag = memalloc_noio_save(); From patchwork Fri May 5 19:46:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98674 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292724qge; Fri, 5 May 2017 12:48:25 -0700 (PDT) X-Received: by 10.98.14.13 with SMTP id w13mr12906161pfi.59.1494013705307; Fri, 05 May 2017 12:48:25 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.25; Fri, 05 May 2017 12:48:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755506AbdEETsX (ORCPT + 6 others); Fri, 5 May 2017 15:48:23 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:59894 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbdEETsQ (ORCPT ); Fri, 5 May 2017 15:48:16 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Li5LP-1dtpOP2onT-00nTCA; Fri, 05 May 2017 21:48:14 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 33/87] scsi-tgt: fix type conversion warning Date: Fri, 5 May 2017 21:46:51 +0200 Message-Id: <20170505194745.3627137-34-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:doNf2UQliAhVIcbNGF6oLAvSoUANsR95VkRH9nrCbB3/v3Yc2k9 B/n65zVdQqUPHiGVYJjGta2nzF0C5YMhBr6gOqTA0awDqCm7jc6vTVawBmxAXCjzZDEEm0Q PLQrfw56zzNkawbxgNqTqC6XMTJMUYhVEoDGBJwYe1nr3AvChm+h4WcmPtAGx+/UtYiZk1S jis81V7YVhps0t5jw1nIw== X-UI-Out-Filterresults: notjunk:1; V01:K0:WpBpxN2xP44=:WTyyboiKG6X0cfVpE3suFH R6abIYdxMtEHbnZlZ7W5D7FdOUxEc0r6O6J6LXxrG0f28wefpYVi2QlvHdN71ugZVyztefSy/ bk0VE05eSg1a8ILwFigw/5vr9KEJomngKqzO5AF4cvV1nPgt6xeWN0N+vL1tBMz/wsXOJqQly oLsAWI6Eu3/U2s6BfhVeuUkz9V19iRLSxojC0q3nKpBBCj/t0yubv36HqrnZGa6qKCQbbjwl9 UO+SG0mMT92uTj1J2PFDk6htIVkpy8RWMTjzHWAmWMs4+3QRrZmOGtA71oTEiiASmN7h0gBOx EXTXpY5u13WCpsEEpLPNo/TlefRUGwZSeG27do8HRDF84m9ZyYckaHtfYrM7iTsKCfMlPYdRb rvaEqnVQtMOfBB8xx/7Hh8xQxRITtps6nvGFiTZCXlnpET57bWe+oLpC6kAQVJ9Rzs+UTwLkp b0D3LL1vGZ1eO/bxSFf84pAl3ON5WxoSqmmivyzwyCulHscEK3IDr89/ccnDXvKBZVn7Bt5Ev WqWSMGJqqigLBVfDa/GAtWKImiv7eMJ8uqlac/4oP8xtxOALkDaBJM56HwW24fXSDpd1FxeL5 8B7hpU8+52qmbRm4mJV0cAqtfmD9+x0o0oF8q0UI+Nel2jwLzPwG3m2ElKv5DFKOwuKpGRzuj fWHBhEUVpuI4GdUjgMyras2fWyuDx+pkKiswqf40cOQv243ZpLvUZMiBFhB+w5g7R1qs= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org In 3.16-stable, we get this warning: drivers/scsi/scsi_tgt_if.c:289:36: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast [-Wint-conversion] The driver was removed in 3.17, so the bug was never fixed, but the code works correctly and is only lacking a cast to build cleanly on all architectures. Fixes: 97f78759ea1c ("[SCSI] scsi tgt: scsi target user and kernel communication interface") Signed-off-by: Arnd Bergmann --- drivers/scsi/scsi_tgt_if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c index 6209110f295d..7199753591b2 100644 --- a/drivers/scsi/scsi_tgt_if.c +++ b/drivers/scsi/scsi_tgt_if.c @@ -286,7 +286,7 @@ static int uspace_ring_map(struct vm_area_struct *vma, unsigned long addr, int i, err; for (i = 0; i < TGT_RING_PAGES; i++) { - struct page *page = virt_to_page(ring->tr_pages[i]); + struct page *page = virt_to_page((void *)ring->tr_pages[i]); err = vm_insert_page(vma, addr, page); if (err) return err; From patchwork Fri May 5 19:46:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98705 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292934qge; Fri, 5 May 2017 12:48:54 -0700 (PDT) X-Received: by 10.84.229.15 with SMTP id b15mr30865618plk.14.1494013734756; Fri, 05 May 2017 12:48:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.54; Fri, 05 May 2017 12:48:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755877AbdEETsx (ORCPT + 6 others); Fri, 5 May 2017 15:48:53 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:56918 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754515AbdEETsi (ORCPT ); Fri, 5 May 2017 15:48:38 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MOo90-1dAYQK48fe-0067VD; Fri, 05 May 2017 21:48:15 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, James Bottomley , Arnd Bergmann Subject: [PATCH 3.16-stable 34/87] ips: remove pointless #warning Date: Fri, 5 May 2017 21:46:52 +0200 Message-Id: <20170505194745.3627137-35-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:Y739RN2QhOPL163ldt/25u7a+DHFhLIooa9AAquWadtpg0cQ+jE /+AcWhSaj8D57VNiCQ/jzenbwnEWLcH5X0hrXRR+FiMtQqBHJ56jcBdvFyuuyCZ3j6gKMOy FkXZcFVyXtpbej5mPDui5gmnhSsnMQHs3RSuWDyG4YpGW3Klx4GrSA1yloyBzeUSzTarOY8 mZr0bPDX3L+YopwyxfU+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:Ya1liCFwZXE=:uTtZDmnf1gwhESQDECCy8l 7Wgv3o//FgwHIaupcH3IjqG7mxyyR87Zwi/+gcisY89YWtv82b9AWRrhxIYJ96RF+Mo5oqaLQ oouWWYl23I/ewn9Z6irKaJwjdrV4mds0a/krSsztc8jISqhfpyKBhZHDptDnfaPH/Rvx5GQ17 aF0xezDpu+ZyBO51SPcyZG2x5eN1XsSIoD65DMn5LFTpjl/S5/VsA5e6sxpuTEknz2A2XeXXE CUZJpCcrciZ+7qGHGBSXPx12ayEkOHlNCFptK/jQzKZQwl3F8z5lmSgWkSvClzfkWf1qk3abj 9LGLryunrEi+xVGdJWRfcqm47SMgnlV7Z28NZGa1/sTLpW9uMjKJpr/qjYJw+fVOmG3zisI0J a9H4wUhT6KfvDCHfILlgf8SrWbabmu5Iav35jdb/R8tS79gOCRWfrNf/tSYmlI04CNN79qCbG kZLkYUUI8AetcPBppYRoMPQNM5JkoqMi8Va7FqktrHj1QS5r/rOltjvfdd5c9/ikbHKuiVRQN uM42sEsCa99j5EOh/UjPhgwowVJv+c05sG4Di0zUTWZfk4I9eWGyGbO37+h8xAsKjln17EZki cODMO/+Q9k9LbxH2OSU2lNqXqJhHwQebVGUFTymhCZvhS86Q2pEalS9RRKSm2xXU1m0dawHcZ APRPhkhCnO3vzaDgTMBG6+lyAId1L7+YAyJZGNAtn57Ryp5gfaTXL2ZY1NoqVzHyK3YE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: James Bottomley Commit e03c2da6574223081b786960e39c1e5ecf5d492d upstream. non-x86 builds want the #warning in the IPS code about compiling on the wrong architecture removed because it keeps triggering on their platforms build farms. Transform from a compile time warning into a runtime one with taint to preserve the original intent of the authors. Acked-by: Arnd Bergmann Signed-off-by: James Bottomley Signed-off-by: Arnd Bergmann --- drivers/scsi/ips.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 52a216f21ae5..946084014316 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -206,10 +206,6 @@ module_param(ips, charp, 0); #define IPS_VERSION_HIGH IPS_VER_MAJOR_STRING "." IPS_VER_MINOR_STRING #define IPS_VERSION_LOW "." IPS_VER_BUILD_STRING " " -#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__) -#warning "This driver has only been tested on the x86/ia64/x86_64 platforms" -#endif - #define IPS_DMA_DIR(scb) ((!scb->scsi_cmd || ips_is_passthru(scb->scsi_cmd) || \ DMA_NONE == scb->scsi_cmd->sc_data_direction) ? \ PCI_DMA_BIDIRECTIONAL : \ @@ -6789,6 +6785,11 @@ ips_remove_device(struct pci_dev *pci_dev) static int __init ips_module_init(void) { +#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__) + printk(KERN_ERR "ips: This driver has only been tested on the x86/ia64/x86_64 platforms\n"); + add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK); +#endif + if (pci_register_driver(&ips_pci_driver) < 0) return -ENODEV; ips_driver_template.module = THIS_MODULE; From patchwork Fri May 5 19:46:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98688 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292800qge; Fri, 5 May 2017 12:48:36 -0700 (PDT) X-Received: by 10.99.127.70 with SMTP id p6mr5465127pgn.169.1494013715946; Fri, 05 May 2017 12:48:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.35; Fri, 05 May 2017 12:48:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755621AbdEETse (ORCPT + 6 others); Fri, 5 May 2017 15:48:34 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:56054 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752999AbdEETsS (ORCPT ); Fri, 5 May 2017 15:48:18 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LpCLN-1djLHG0v2r-00fBCi; Fri, 05 May 2017 21:48:15 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Hannes Reinecke Subject: [PATCH 3.16-stable 35/87] scsi: advansys: remove #warning message Date: Fri, 5 May 2017 21:46:53 +0200 Message-Id: <20170505194745.3627137-36-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:nNekOeo9fV1zY9yy4bpHnKKp1tdHfOY4iTWyt8VZkOs92rKmPSn SLflKea2hK5D19t0SYg3UvC0lyL3m4WAp0vELFMWR9LGFOcO/bmmKjJ0n0N328c5HRejTjO FmrrIL7IJ/EzOALgi9EH4dSCLh8AJP59KpIDfIbssdmBZ0tiisVVI7/NEB8vgIMObFDgP7U xUv+UeoLs7dNfJBECEgNA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Y+qGr4m2pm4=:yemT3lBUk7saOB9OAFZ31g B9NDZZJqeuURclmBpa2J9UwtwdDGxIutZxEElPvxtqanNhId88rHAtUpnLQiO8zJ7gfMgmD6V srPtVEvXeYZ6dkBY/XYt8FZCFzqiw1T8xYNmq7GYGqvyTp9yLWs47NDKxUExl1nbpipjnurq9 poo2R0PYfZWUX7fvPDkS9XkEcZrRmblTBFakvqqteEmOuH0r00YTnooqxs8CRvsWd8mdFGWds nWjv+YFo4NG2tbP5MqhQpybV7G1cc4B357ltYd66Ar3MVsmzAy6KX1ukXZaW+VTTSRVX4p10J j6Q78cF+nj/HFinDpay5XDF+DuN6mhmz3/tUiSaOkCCOdhnHHS88I01Hl3MPLKcslSPjuhgLb vtOzIxUaRbtfvknmUQY5GneMC/jpUoOtDneWjXkEm1igvg3OVUnusH+D81gx5su/4dZN4TiK/ 70SPI/x3+yOwhhJ+d3LWcuXErWvVouTqvozmYf7g6e/0XvJFwpm+8g0py+dR3w8+HO/kinmgS VNFASfHWyZDfSsjXP7KKvCFpyVJin012C/6/MxWcNqyAHgTYCvvvOTjetQxfYoLCsopkSsTro ni/6WM+K9v+ok6SfV5YDx6PLiOBL4AeDPsqYVQm0tZmcQ/vVU1huVBEU399yXoJ0DoUutGhyc KwWKq3mqP3nHMxYdytHEYPQYWC0jY83cvODCPqZfYwZJwT2ebfnEh372xvwBrIPPTKzI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The advansys driver was converted to the proper DMA API in linux-4.2, but the 3.18-stable kernel still warns about this: drivers/scsi/advansys.c:71:2: warning: #warning this driver is still not properly converted to the DMA API [-Wcpp] The warning clearly is not helpful in 3.18 any more, it just clutters up the build log. This removes the warning instead, and clarifies the comment above it. Cc: Hannes Reinecke Signed-off-by: Arnd Bergmann --- drivers/scsi/advansys.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index d8145888e66a..8cf443eeeaef 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -49,7 +49,7 @@ #include #include -/* FIXME: +/* Fixed in linux-4.2, not backported to 3.18: * * 1. Although all of the necessary command mapping places have the * appropriate dma_map.. APIs, the driver still processes its internal @@ -68,7 +68,6 @@ * 7. advansys_info is not safe against multiple simultaneous callers * 8. Add module_param to override ISA/VLB ioport array */ -#warning this driver is still not properly converted to the DMA API /* Enable driver /proc statistics. */ #define ADVANSYS_STATS From patchwork Fri May 5 19:46:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98698 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292885qge; Fri, 5 May 2017 12:48:47 -0700 (PDT) X-Received: by 10.98.138.145 with SMTP id o17mr17894742pfk.69.1494013727330; Fri, 05 May 2017 12:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013727; cv=none; d=google.com; s=arc-20160816; b=nHj7aRSP3pp40LFxMTac9XkOWURsBfDB8nPx3fEfVZ8TPL5NMiiw3fN+eoellJsJQB Ou4XgNIwQXRpI2iFD2RoQnqYfOcA14u4hUzBRSaPqiYTLz6IPibzw7YK9KRoonznLP33 nFt07sGYh5ARs/i9Vu1u+/3C02H6dlyw09OFKuNEw2ZZm5i9ktMQOelCxZ1bK2VRNjVK cEZfvoV1C844LMymSYXct2MpOz4sY43EFw6SxngECj7ynELzsNnSYp4bPVPGpbrcToJP n95oQx/5F0Jxx6OPEYYptVRQb98FDtgGU3hO1yjLrmA79imvjaopx0bHVIOnv+e5iXIZ IivA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=ETHIzzz5HMXrQ8LNhNduoDeN2AxpjaU7Gi/grMVOktI=; b=TgzXcUbZJqo0YACpBG6bdOj4yT8GCFencweNz2+QkNQR2JIJzcn3No7uq7NNvM0xzG yTd7vrzrSmcCOsldJt2RsKyJSiks0MBnT0hUVMJs8XyU6+hYwNRSdTKdjG6/HZtnB70N hfuEvPKd+eN/dEAgOPWZPSsC06LnMpZ7l9/pi/91kpn7Y0smbjtdA4AXD+AebCArmc2o AYov8LNkiwP0J7zYOj/kt1gkP7upXNVLX6wO9Rg8jafvTKXWcfTPuaHb79Bxqt+qRSj1 Hw70OSSX+HTAaMmbDnxttbooCg9WIqOH094wWNDAr69lJU05gkCyBoBksSduiV9QbPrB kZiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.47; Fri, 05 May 2017 12:48:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755826AbdEETso (ORCPT + 6 others); Fri, 5 May 2017 15:48:44 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:56292 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755654AbdEETsg (ORCPT ); Fri, 5 May 2017 15:48:36 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lawjh-1dmhr42L1d-00kkAG; Fri, 05 May 2017 21:48:15 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Anil Gurumurthy , James Bottomley , Arnd Bergmann Subject: [PATCH 3.16-stable 36/87] bfa: Fix indentation Date: Fri, 5 May 2017 21:46:54 +0200 Message-Id: <20170505194745.3627137-37-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:dCgr7oRV9lSos80LTIHGhTtm0IChLgKD5y45gpxN4aI85SfaDr5 oX8f1iBMjZ4tHmN50Lvqq11xhRfxxurAhkv4XQE3/X6wucFRN6x8FVpV0V49s42VwMO19H5 pXy2GPqNG3WRuanNsNynj94QdpPtRGAHpU0oBiWdwNY49mzG6k19fPSBFBwMd7v994SFgaQ ExakmefyfbHxuRKcyYOgA== X-UI-Out-Filterresults: notjunk:1; V01:K0:blikDFbOY2g=:VENR1ra7wzYVd9/P9SN7UC h1sOER+n4kpXDdmHmYjQFRzsvajzSxGHfA3v7NTM2n5451rCwDig5PhKjVBamSgoNdYoI0/fi 0jusqcnvLBzmYn/YkBbp2iz7dB0XbOqR6418McvyLtIgiOuOOAJcuI4oXQ3sf6WJlwoHchFKi vyKKN61Fm/JgECFVUdRwzMrWEzlcWoSv4jiFyDBvIb0b72plV/AqTWTdUXdMTR/EMPSqNzZQP Y2HNzLqyLcnUXz2vYw9Cnh/oX8VUP/5JtKePpzDuO8Y1YbT303YSvtzco1Io7ZkFCBV2ohotj I+l12lQsJ9CZjedyVf1++cx+G7yQpUwpyDikVIFVuWkgAwxK30hYwQ+YdO+fxwdwH0/d3hmFP /g5ibTAR46cNijhL2+130aBNnmim3zOs1jGiqvwB7J4UC9MLMETz4rUhTnBuTkG3G7YWE/2m4 wgFi1rceqrvA/jWAvjvSfGHB4HjerNRvOp3G07/3e6KibMru3Q0CFrVXldX84zNknmOC0NQI8 5MS4r+54My885vjqOevGbF7SKaDaEZEik65Xz2YDn23AO9bhqrSxh1nS/DY99zG9f5NNpPrSk MTp85dtwlJmCaur9k5znxudw+yh8hsUAeuunv3Yh99GAs0Gx/efPq0IJZrbBn9dnTeRVmewRG sgHRKv55WLznKO8j8ji7G1TBY1GPYE/WaIA/anFQ0Ag02ISvmSO07cvcQ2gQPfN2w5Gg= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anil Gurumurthy Commit 956d6c6aacb80fc4f6ed2cb9e2aca0deb2ae3657 upstream. Signed-off-by: Anil Gurumurthy Tested-by : Sudarasana Kalluru Reviewed-by: Ewan D. Milne Signed-off-by: James Bottomley Signed-off-by: Arnd Bergmann --- drivers/scsi/bfa/bfa_ioc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/bfa/bfa_ioc.c b/drivers/scsi/bfa/bfa_ioc.c index 315d6d6dcfc8..4e7104461f09 100644 --- a/drivers/scsi/bfa/bfa_ioc.c +++ b/drivers/scsi/bfa/bfa_ioc.c @@ -3665,19 +3665,19 @@ bfa_cb_sfp_state_query(struct bfa_sfp_s *sfp) if (sfp->state_query_cbfn) sfp->state_query_cbfn(sfp->state_query_cbarg, sfp->status); - sfp->media = NULL; - } + sfp->media = NULL; + } - if (sfp->portspeed) { - sfp->status = bfa_sfp_speed_valid(sfp, sfp->portspeed); - if (sfp->state_query_cbfn) - sfp->state_query_cbfn(sfp->state_query_cbarg, - sfp->status); - sfp->portspeed = BFA_PORT_SPEED_UNKNOWN; - } + if (sfp->portspeed) { + sfp->status = bfa_sfp_speed_valid(sfp, sfp->portspeed); + if (sfp->state_query_cbfn) + sfp->state_query_cbfn(sfp->state_query_cbarg, + sfp->status); + sfp->portspeed = BFA_PORT_SPEED_UNKNOWN; + } - sfp->state_query_lock = 0; - sfp->state_query_cbfn = NULL; + sfp->state_query_lock = 0; + sfp->state_query_cbfn = NULL; } /* From patchwork Fri May 5 19:46:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98686 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292779qge; Fri, 5 May 2017 12:48:33 -0700 (PDT) X-Received: by 10.98.40.4 with SMTP id o4mr18441242pfo.113.1494013713340; Fri, 05 May 2017 12:48:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.33; Fri, 05 May 2017 12:48:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755575AbdEETsc (ORCPT + 6 others); Fri, 5 May 2017 15:48:32 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:60316 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755464AbdEETsV (ORCPT ); Fri, 5 May 2017 15:48:21 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M4Nqe-1dyP9X3foq-00ydrV; Fri, 05 May 2017 21:48:15 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Hiral Shah , Sesidhar Baddela , Christoph Hellwig , Arnd Bergmann Subject: [PATCH 3.16-stable 37/87] fnic: assign FIP_ALL_FCF_MACS to fcoe_all_fcfs Date: Fri, 5 May 2017 21:46:55 +0200 Message-Id: <20170505194745.3627137-38-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:qe7RkTBglxcO+SBnN95NCxZLWKGyu0AmL15bln8awZzqtBv3Ra2 yD2kOuhHjxRnlgCFweULg7Xhfqp9IChCwda+yFg19f+R8p4LDzCS2ye2MSsyv401LvSzcqI 6+sfeM0Q/RRLc/7+NBkRkJbflkOh/0XvfMS7flTUvQAiMqyrowVA8OivYgGiM6HKZKK8puD BFGPQuDxxtmV4vdNXv6EQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:s346YC32kaY=:FQPuk78cJ+jpBCVv05/TKW sIrNhX87dU9GBzsAZ4yPvyrozeMzWj7tvKJ7nH4mjnkcC4WsBDiRNh7LW2VcbAIzRoPdTQDm5 RyEbISwxwBWjrIdLjLBQ39QJTcPAlzonWAlvZ2QtfZDDeT2t+6EdNp2lUithE8n1781DVKFhI ZS4aOES5jknv65KdE3WlIoeetcTVJdB8ok5Z6+sehl0qkNr3CGT9fINElK1JbX8JMGqrwEE0q tLJHdSo7OxnzJzzU0BqL06+VkPOVBgQsA6VNtSPkAjjq8AaesOlTg+1o4IIbFl5GkmRwSaPLg Q0QmNYslW8tZ0mtNRMH50HDf4Z1w0fwFG8QYR1iw5aDIFCLcb1G6qu60u+MH+VzCAF09s/x3s PmuuaclvjTMZyhYyx+xk4kn349mCz+IOcPNbgEkUCRK9dVsVb0zmphyQAWz/J1/FNdJHkUiRy T1jcK0y/9zV5ywiw6ppXPaZ1uhDcLwsxq2cG7RHO1xWZ9GIkKb0i6JNiwu2yxNRl6Tzn2crPM 7eSjvisdsJv3NMWQ5dH3U2ab+W3R9Tqxt4opnJUnsBZUUxRLeeP+28ZhuzXoiNwTGYjG+Knl/ iWBw9016SPVS+zxa/PqJJg/qJDAgaN+KYqjMexza3jK5oArY4t2u5I2pBLJ3p6P/dO7QmaiXy L2GAtSeLiY+sw1Amelmlz5Xgpj8OLLsMb34FFnVROqfF0JIlgPeCNlVjEkEO84AqzXzc= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hiral Shah Commit fffd96e05f5a23eaff542951e7d3ae4ec2f6258f upstream. 1) Assgning FIP_ALL_FCF_MACS to fcoe_all_fcfs allows VLAN request to be sent to correct Mac address for VLAN Discovery otherwise VLAN request will be sent to invalid address hence FLOGI never happens. 2) Simplify the copy_and_format_trace_data code and log the correct Link event for fnic control path tracing in case of link status UP->UP. 3) Increment Fnic driver version Signed-off-by: Hiral Shah Signed-off-by: Sesidhar Baddela Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_fcs.c | 5 +++-- drivers/scsi/fnic/fnic_trace.c | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 1d3521e13d77..bf8d34c26f13 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.10" +#define DRV_VERSION "1.6.0.11" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index 1b948f633fc5..f3984b48f8e9 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c @@ -35,7 +35,7 @@ #include "cq_enet_desc.h" #include "cq_exch_desc.h" -static u8 fcoe_all_fcfs[ETH_ALEN]; +static u8 fcoe_all_fcfs[ETH_ALEN] = FIP_ALL_FCF_MACS; struct workqueue_struct *fnic_fip_queue; struct workqueue_struct *fnic_event_queue; @@ -101,13 +101,14 @@ void fnic_handle_link(struct work_struct *work) FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link up\n"); fcoe_ctlr_link_up(&fnic->ctlr); - } else + } else { /* UP -> UP */ spin_unlock_irqrestore(&fnic->fnic_lock, flags); fnic_fc_trace_set_data( fnic->lport->host->host_no, FNIC_FC_LE, "Link Status: UP_UP", strlen("Link Status: UP_UP")); + } } } else if (fnic->link_status) { /* DOWN -> UP */ diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index c77285926827..121a5d7e98c4 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -743,7 +743,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, fmt = "%02d:%02d:%04ld %02d:%02d:%02d.%09lu ns%8x %c%8x\t"; len += snprintf(fnic_dbgfs_prt->buffer + len, - (fnic_fc_trace_max_pages * PAGE_SIZE * 3) - len, + max_size - len, fmt, tm.tm_mon + 1, tm.tm_mday, tm.tm_year + 1900, tm.tm_hour, tm.tm_min, tm.tm_sec, @@ -767,8 +767,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, j == ethhdr_len + fcoehdr_len + fchdr_len || (i > 3 && j%fchdr_len == 0)) { len += snprintf(fnic_dbgfs_prt->buffer - + len, (fnic_fc_trace_max_pages - * PAGE_SIZE * 3) - len, + + len, max_size - len, "\n\t\t\t\t\t\t\t\t"); i++; } From patchwork Fri May 5 19:46:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98725 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293451qge; Fri, 5 May 2017 12:50:09 -0700 (PDT) X-Received: by 10.84.224.66 with SMTP id a2mr31704337plt.191.1494013808932; Fri, 05 May 2017 12:50:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013808; cv=none; d=google.com; s=arc-20160816; b=WgKC7qC59waFONySCoueDPxnYtl2ZT4CZJMN/lqFAYcVBH79rhJA8zw2cE55gTzEX9 tsYC/aW31SRG+yRUIbMUrPn4IWEUFOHomg+4/CngzckhJEau0m+EwHBOLRD/tqY5alkk uw1EXjpM6dVRf+PXCf1GFFM0FbVB8vysbO6skxknA2K0/AP7rjMCBPIypHg5xTbe3uml Av+Lk48kneWDVIvzujNsbepBESKtJ9aSKIPA9JQbLlYV4P5YfhvOpg3EaRk/m95j80qv mnmX4DL0YzeAUiKuPciwtO+L2a7vArmTC0q/D2dq3DHSUDbXPkM9G80TZx7uR/grMMAK 5A2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Oa71NQLlXuffHcvvpUuvPUN/N3uxCs5liIt7X1qkv2o=; b=oGbjtf0xmrZJ60CgNkdLnnXIgPnVVuqWznrxr0fZUF6++WdGR4eYPdrHuEp60PQpaP z/ZHTF8v7XsNNETZeP3S9HJv7D9wXLLIKTL9g6iLaRGl50DTd7kgrvzncrjKK8TfNu8c n8vz9oHgxD1i067aEePVFCFw6hMjF4Sow9q26diRwOO9r0nsv+OwWezpRex5RH50KjdQ 3sGTRbYIciVuSk8Cj9nVBKHPecyUR9KupzdjbzHS25FcT2LZQisVh/Wlvu1UTp+MshYJ dq4Wm3bjwiKkGIhUnIKrzEbmISIlUJObRYxmS0v2sar2OCRo0u+4H6psowd5R4wOLR5S wXFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c5si2571475pga.119.2017.05.05.12.50.08; Fri, 05 May 2017 12:50:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755830AbdEETuH (ORCPT + 6 others); Fri, 5 May 2017 15:50:07 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:51174 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755640AbdEETsx (ORCPT ); Fri, 5 May 2017 15:48:53 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MDYoX-1dGvIj1aNZ-00Gszo; Fri, 05 May 2017 21:48:16 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Tim Gardner , Jayamohan Kallickal , Minh Tran , John Soni Jose , "James E.J. Bottomley" , "Martin K . Petersen" , Arnd Bergmann Subject: [PATCH 3.16-stable 38/87] be2iscsi: Fix bogus WARN_ON length check Date: Fri, 5 May 2017 21:46:56 +0200 Message-Id: <20170505194745.3627137-39-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:yvGX7i8doaS1uDPWSoyhF5cxwOTBXxwLUcW2wE9Jh8EGMm9e/F/ EXWrnPRMt+ye41OhamEpLZDAgGIg52RbnwgA/vtlWKQ/6y7CU2ZKzGqp0BfigfwhIfkn+KX nRIHeeeAhEVmwKx9B1UztLn2LXEfF5Z+SqpVMYkyPSqPZw30plC7FtCzv1NGnrHfPp3rK18 uSkKPtrd8cg5Lvu+rfPjw== X-UI-Out-Filterresults: notjunk:1; V01:K0:Awkm6LiyEG4=:zEFL45HK0sX9uULzPqPzx8 jyd2WbrwShESGbpuhToicjZHxr1yZv51yukVh+hK2mkuskLCdFry/GG2cSuWJhv2RO8U6USTF xkCWYl3WCUohoKoN8o3ieBGHtDAxhkgunv1DM+amMixnz72XS9QuvweYh1XJCwaZneDrw1hBC TP8/nV08sIKYsLpbUGL2jI8vib765eT+igVH/Qtlq4DhR0FoP1b4KZWYwpoI79uawgIKIOa47 B3CHmGFeA9m0W5FGVEJk9khvVmlhZ+3r592zK4HBZUg8H0nTA5k4+V9pZAuQF1dRZ2TLxJYlQ cQNV9x1mbrKXB8cN76hQuIsNg7cqBmB7DQROWQlHB4y9sN/Diac82xi+FogKivPCXhst8XlGn 4IfwAG1B/RHzzLJ4Z3w9My3y6sLIbJ8Dw+sVanHVIFiuJ/YvBOco0CZ0N6zPRkDnUjlxpkDrx IkYLBDQM+9aSwH/iO9S/BHi9hGmGwK9Po2VX4XY0ykyTYoq9XKUT10e1z9bYknhK8hudputwl CBVSXf9FpUeW85hloi9pHVhxfLS/nyjefn7Zk9uEJnJBInHY3wHlOQ4l4r433Q9ucRMk2+WSB j8QAxhtW4vqden5FAAIlWhnHwT2yZAQVoh8e3LjhURHbsBmWfkrPXHwmoXTKCK3imFeHywpiI DG+n0yvFXQDUKvJDwnN9+vwL9UnwoI7juqIbM76igeLVNNH7/EGgOZSuqa49cSFphgJQ= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tim Gardner Commit ff5260af23815ff79dffa9b4a3cca1260692b094 upstream. drivers/scsi/be2iscsi/be_main.c: In function 'be_sgl_create_contiguous': drivers/scsi/be2iscsi/be_main.c:3187:18: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses] WARN_ON(!length > 0); gcc version 5.2.1 Signed-off-by: Tim Gardner Cc: Jayamohan Kallickal Cc: Minh Tran Cc: John Soni Jose Cc: "James E.J. Bottomley" Reported-by: Joel Stanley Reviewed-by: Manoj Kumar Signed-off-by: Martin K. Petersen Signed-off-by: Arnd Bergmann --- drivers/scsi/be2iscsi/be_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 1075b7001e4a..d5068e43cfc5 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -3152,7 +3152,7 @@ be_sgl_create_contiguous(void *virtual_address, { WARN_ON(!virtual_address); WARN_ON(!physical_address); - WARN_ON(!length > 0); + WARN_ON(!length); WARN_ON(!sgl); sgl->va = virtual_address; From patchwork Fri May 5 19:46:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98734 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293642qge; Fri, 5 May 2017 12:50:39 -0700 (PDT) X-Received: by 10.98.75.6 with SMTP id y6mr12274720pfa.157.1494013726401; Fri, 05 May 2017 12:48:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.46; Fri, 05 May 2017 12:48:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755786AbdEETsl (ORCPT + 6 others); Fri, 5 May 2017 15:48:41 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:60808 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755606AbdEETsd (ORCPT ); Fri, 5 May 2017 15:48:33 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MWKgT-1dZYeB0UKf-00XJv2; Fri, 05 May 2017 21:48:18 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Luis de Bethencourt , "Martin K . Petersen" , Arnd Bergmann Subject: [PATCH 3.16-stable 39/87] mvsas: fix misleading indentation Date: Fri, 5 May 2017 21:46:57 +0200 Message-Id: <20170505194745.3627137-40-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:pYQnk4xywGiLjjFZjMqq5CjWmosIuk4N9KzxG1MXHq91SvC4tHZ /5s1Yb97AK3BV3FYtE3qhrEDetq9TQIIDhx70f3pvMfQkwxlr4wh2gdrt99JS6Qc4z1CrRY K+DfUT8c1mo9Lkq7AP+5XbHh0P8HRsMJ24D1T2evGcpoM67RoW5a5ek7ZlLgANqgv0u0Y4P kZBBr+O+Y2U18Rkob2Bmg== X-UI-Out-Filterresults: notjunk:1; V01:K0:XsUyjGyd/kk=:UxAtz/n+fnCRkbLZk/MIBg 3LtoxOnNjtzCIMP7geMAN8/xdvATUFHtLv2gtZ1ukH4PC1WvtY351Ko92yL250OxgvT4KT+y0 gtHG4MZ2QwHSg7nZmOyo+Y8oMeAAP3P0oUp10M3W1dtjzlcKd5CmAn1ylB6rgLNodu+uy+oXp ivCvzXXA/qTY4GVZ5Vqh6MZr5NJSsa7Oee9sDO9F3UAB8pn1W5HsMs7RsoTnpCtzT/1lKFnlZ neGf06AyN0zE2KCAl3jXP8avQwmbNripzaNzG53bIq29YXFzT1uYmg9a6O3Y+AFbCz6kNDMMF 8/lhsSvTw8/wYKqvzY+esKpZ6B3Ux8Dfh+3HuIpqmXWk98qVSR+qCu/lXirCvS3dlmsR0Qd0x Ij7dvwpBrkFvksu1cW8n/4uELvK2noLkFsCqALGBnIEYCFzR8Smqs9DSBLLoqtXQhFiBfZBjN NbNpYH7sHo4jUnwIZhItSrp/qQMOPT6XfSBWaBTvBRqBWuohj2VMgpLiWaW2mJhmNG3/yeJli 6lNrx3o5sRIdgBFka994AjlueWGOERxE+GQ4ieV+6EVaXqXp7ib7ZvBDAbeXc0t6mjtEvCA23 wXu7Xs6k3CKXY7WUytbE13xDDPtXvUtVsJTIzEtBNWwr7L+6a7Up+RZJdqZ4xA8Id6sNn308f x7/gN+4ENHPKIh7b6NK1C2PPhMoIXaI9/rvtbiI+iZD+Y7KWLUttziy4LvVidlRgCftY= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luis de Bethencourt Commit f8fe5d3a9286263fb8aad500b91f39dda0a302eb upstream. Fix a smatch warning: drivers/scsi/mvsas/mv_sas.c:740 mvs_task_prep() warn: curly braces intended? The code is correct, the indention is misleading. When the device is not ready we want to return SAS_PHY_DOWN. But current indentation makes it look like we only do so in the else branch of if (mvi_dev). Signed-off-by: Luis de Bethencourt Reviewed-by: Johannes Thumshirn Signed-off-by: Martin K. Petersen Signed-off-by: Arnd Bergmann --- drivers/scsi/mvsas/mv_sas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 42b1f3318e59..eab05c5f8b0e 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -737,8 +737,8 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf mv_dprintk("device %016llx not ready.\n", SAS_ADDR(dev->sas_addr)); - rc = SAS_PHY_DOWN; - return rc; + rc = SAS_PHY_DOWN; + return rc; } tei.port = dev->port->lldd_port; if (tei.port && !tei.port->port_attached && !tmf) { From patchwork Fri May 5 19:46:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98738 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp391499obb; Fri, 5 May 2017 12:50:56 -0700 (PDT) X-Received: by 10.99.171.15 with SMTP id p15mr5361005pgf.121.1494013730681; Fri, 05 May 2017 12:48:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.50; Fri, 05 May 2017 12:48:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755761AbdEETst (ORCPT + 6 others); Fri, 5 May 2017 15:48:49 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:62360 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755623AbdEETsf (ORCPT ); Fri, 5 May 2017 15:48:35 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lyvo0-1eAXI22P6e-014AhR; Fri, 05 May 2017 21:48:18 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Dan Carpenter , Tim Waugh , Andrew Morton , Linus Torvalds , Arnd Bergmann Subject: [PATCH 3.16-stable 40/87] paride: fix the "verbose" module param Date: Fri, 5 May 2017 21:46:58 +0200 Message-Id: <20170505194745.3627137-41-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:TkABzzpS60DYOZ4jTzaTYyElGFLKfLMIsuTeXnfyP5b75qXErrF iH/tqfzQWKiXYCfshB8qgxrzwAKtjXJoA8lC3pNm2RgF+XXC+GJRLIr3YKNLQNHk/7YnO3g oO3hSxf3Bt6qTEchtXOgRT+xw42B67oOahsDWjgyWbvIbDmzNOnHNHVrpC+orHHXTyltC1V +UhCL6w7LCaOsAcOdW2tw== X-UI-Out-Filterresults: notjunk:1; V01:K0:o6tCEnkxb8U=:Xrobaaz7VcqFXBOfZo7WsC vfq9EaFIiV+9jUntVYRpaMxBpK8gZiRkhuXJizcGPPdvHBXFLTan5SCAcLIbzNJOuYjAZIZG3 cMXo5UbwkHRxj1Xe/74wH3TNXUfADpmdWLpgZJqiStfzvIUEk5VAzHhpVTYTusMY5znWqiz9e C9n89IAMNat1emKJa30DFsFI1ZOGkYIumT6v38JXyw9IXqkSmWbVYpz2P+fZe0VCEsZbSTLlP 9AdordJHjx0Nd4iR8MYSxn6e5D61m+VlRecFHs1wgKBOk/oniwea4+fmPs0BfA+UFZMue9VOQ UgYi0BFdqIUVQjNUbmBKpn+fBeaeiZXwCBzUq2pgTyV9wvoN+eSWQ0O4Jpsi8+AKEV0+WEbfH Rc4dtXX2hqAB7wQuIMpO/CUDhMIX6vZ8d1C0yJqv1BPTWe5KnMsILhY4f53bnhQZUnpsdZeId kboSnf9zVPGZinox34BCuYWcQQ4egv5wbEiXwYLsGhgzvfva+fhlmpz9P+GFdPowUWlSb+Sxf N72ffLb5nRiC1ez1dopDxkdUPZ+5Qls4C1tFBHoLw3bkY/h4260kGGrVNXmiwHZJw9E/4I/6I cQkrJxGTy9LEh9blndPvOg2gvzvt8LmZ56Gzm5VZV7PP5FwMUbDOSExT3lYlqbwHUC5VK0sUS q8w+ihNZ556kJvzxgTETkwGUUevH+mhdZXLGsq91bt0uiGQ5/YS74H4HyF/uN01+5syA= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter Commit dac6eba5d29aca58fa6832fd70f2eb86a562dc23 upstream. The verbose module parameter can be set to 2 for extremely verbose messages so the type should be int instead of bool. Signed-off-by: Dan Carpenter Cc: Tim Waugh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Arnd Bergmann --- drivers/block/paride/pg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index 2ce3dfd7e6b9..876d0c3eaf58 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c @@ -137,7 +137,7 @@ */ -static bool verbose = 0; +static int verbose; static int major = PG_MAJOR; static char *name = PG_NAME; static int disable = 0; @@ -168,7 +168,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY}; #include -module_param(verbose, bool, 0644); +module_param(verbose, int, 0644); module_param(major, int, 0); module_param(name, charp, 0); module_param_array(drive0, int, NULL, 0); From patchwork Fri May 5 19:46:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98706 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292945qge; Fri, 5 May 2017 12:48:56 -0700 (PDT) X-Received: by 10.98.218.15 with SMTP id c15mr18530106pfh.240.1494013736055; Fri, 05 May 2017 12:48:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.55; Fri, 05 May 2017 12:48:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755895AbdEETsy (ORCPT + 6 others); Fri, 5 May 2017 15:48:54 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:57557 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755712AbdEETsi (ORCPT ); Fri, 5 May 2017 15:48:38 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MFUkm-1dIqAw3nZE-00EOxV; Fri, 05 May 2017 21:48:19 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Hannes Reinecke , James Bottomley , Arnd Bergmann Subject: [PATCH 3.16-stable 41/87] aic94xx: Skip reading user settings if flash is not found Date: Fri, 5 May 2017 21:46:59 +0200 Message-Id: <20170505194745.3627137-42-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:KHvCgfqWNhsD/gn9trYTZRpKxiv3qK72sF8uQnhy1ypOoSXDrQT 3TCuObPcxbgwipzmYgvJkkvZROcnrkITyx+JkyPJ27RpLvWDfeznKgRvCbM2pKa8uU2RgYI sSuhL2800r6YkcdpRtRI6G7ieKbR2rvynpRu9MZRim6UXfK0lHMpncCAb1YbI44qf4+9YQb Ae1dHoCwMhdScCOmHc+2Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:bz+UWA/qQ50=:TS5UNNPYyQsnoezsTxnuVY wFNS2n0k2FNhWMef8qOPrVy7qeuvOr70o5liQIo3ZkQWIpMSSy3/5lVd4CIUzDWnGzr1eQUAs yKavUf9oBXDf2/iXUId2vodByBdoopvvvpeGYGQTerulPSKe/2JNWZdvep5bHXY4r2zto/+l7 tQBkpEXU4ofKU2irg+CGntrN+ZzJ5aXLDVOn2fsabt/FdqVLbNR8j6gce4oJfGMyXcvgPdbmW FQ0oig371+rvf2VsOiPzInQ9132db3xvegwgN/XrPsyigP+/OQbjY1Ooj6N7lslV3nNhvgg38 0vHKH/CfXCzYy2A6sEjChiiiCIYK9zLZ5ZOeKgF+mSw/lFblxURAWuYUZmz2dRLcqDE8k+eaS hT8QglvqpEBFZAET45hm+T5HqXOEkf62ostTYjgeZ2cWGQdWEaJQd3eJO16C1tU6BumNlbVUj N3KuscY22aONA9FZ45SAY6LnnqLW92XPIVUBNbkUOkymFWW1bLyXiP/R1L8gsDURTaHGjd+8C mzxr/8oov4YI/GNaQYILiIHxxOnD/W3T7w/sDe1sOIA6BzQKZAW6s7Z6PehwoJzwkkLBtZsof arw/zVUYWb0Fr674WpnaS6v6qsXerFI000iO0xOs1fXL1kveOjvYXGYp5MLR9x1bE2S8qNkgx dqhQ8jOiP/nSg/QAMJnkejIINrlahpjlYOekJCvmnRCr38ot2bo3kM9sa4me5+JFvhlo= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hannes Reinecke Commit 23efd4ea053c883d98e1cc12bb13319a62b9b045 upstream. If no user settings are found it's pointless trying to read them from flash. So skip that step. This also fixes a compilation warning about uninitialized variables in aic94xx. Signed-off-by: Hannes Reinecke Reviewed-by: Christoph Hellwig Signed-off-by: James Bottomley Signed-off-by: Arnd Bergmann --- drivers/scsi/aic94xx/aic94xx_sds.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c index edb43fda9f36..c831e30411fa 100644 --- a/drivers/scsi/aic94xx/aic94xx_sds.c +++ b/drivers/scsi/aic94xx/aic94xx_sds.c @@ -983,7 +983,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha, { int err, i; u32 offs, size; - struct asd_ll_el *el; + struct asd_ll_el *el = NULL; struct asd_ctrla_phy_settings *ps; struct asd_ctrla_phy_settings dflt_ps; @@ -1004,6 +1004,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha, size = sizeof(struct asd_ctrla_phy_settings); ps = &dflt_ps; + goto out_process; } if (size == 0) @@ -1028,7 +1029,7 @@ static int asd_process_ctrl_a_user(struct asd_ha_struct *asd_ha, ASD_DPRINTK("couldn't find ctrla phy settings struct\n"); goto out2; } - +out_process: err = asd_process_ctrla_phy_settings(asd_ha, ps); if (err) { ASD_DPRINTK("couldn't process ctrla phy settings\n"); From patchwork Fri May 5 19:47:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98681 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292756qge; Fri, 5 May 2017 12:48:30 -0700 (PDT) X-Received: by 10.84.225.130 with SMTP id u2mr31876478plj.91.1494013709932; Fri, 05 May 2017 12:48:29 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.29; Fri, 05 May 2017 12:48:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755543AbdEETs1 (ORCPT + 6 others); Fri, 5 May 2017 15:48:27 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:64832 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755535AbdEETsV (ORCPT ); Fri, 5 May 2017 15:48:21 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lgysp-1dsitI0fXL-00oZ7i; Fri, 05 May 2017 21:48:19 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Brian Norris Subject: [PATCH 3.16-stable 42/87] mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy Date: Fri, 5 May 2017 21:47:00 +0200 Message-Id: <20170505194745.3627137-43-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:T/QTRr/PFLJ5MkWonQEELucQseKsqyAvtnX6ZIeB+phB4VEpReV vIi0gdQxXJUgzsScMLs3aaugGjQjoqqpExjwyyL0aRHDdzjHwDzosNjOe7SMlxFEGUJMkB1 aOx6jZ1MXfgIs9VBSi3DiaA/IvxRtUzQKDUU6goujgudbCUSX6rNqNay9Bk1z4Dh05ZcK0O 764JXzEQIJyYXbR93YJhA== X-UI-Out-Filterresults: notjunk:1; V01:K0:mx0sjLk0crk=:P6sc6oKeZo9J0r+ZCdsHRH XctSs/eXNMYKZNXwH8hcKPL7FmlN9LUwjigycR89664jarw0QYTZbE0pg61rIppeTziWDQpoo CsYm30xewZF7SuzLHUI9OtwO2nYkQLtU7L7Kjk8kZVbz4hVJETQxL6SfwDR7TCwXgOYkxsO2W OUvwaFjnLI6uqgjILi8/L7zuIikvhDORTTy4wSZ1zTWq986n2xCZQnhltfby4MlHdS1RFMpfb FG97RBZ82Vw65g0ChTh690FZj6Yvib57h01hD6rTqauyf6Ka4sOLeT/s1WSQw0bFoZVwbXO5n cCJtpjVmLemfh+ynVPJvapE0CeEj0wTjwPIpzkpCEs8V+s0bwF2J/N6khrREj1XCKUbkFyWg5 Kh6aA6tRal/n29rBPlULfVzb7I0QyqXkdHpNdsDxcaxcuuQRI6Q6YB/do2rs1CqcpQ+7FKey8 0G4Qx3StdNwn5LHj3WMkVZY3ykfPWI0rGQvtk3S533ywBD5TJX8vFY5Xz8EjL548W+1PBDWSr oeOC1Toou/F4n9zc2XpBDfbbg1wrzfbbBMuCzoTjOIs/kkymaaB4cN1EDLcGvCygYxKzI43bs mUT6bieIce2cept64z4Shwa6H8sfIfnucl0hff+z8F3C5Rr9muUXnXd/sPGOceNKl+kiIHn3u hgbspIUpQaRRzUvWZNttl2Cy8/++/BTTYpUzYIbxr6atreaDGGjQOSeaQncJqtqsh4P8= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit b3c3a0685e34e98172cf467e982a7a8a9a89d518 upstream. kernelci.org reports a warning for this driver, as it copies a local variable into a 'const char *' string: drivers/mtd/maps/pmcmsp-flash.c:149:30: warning: passing argument 1 of 'strncpy' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] Using kstrndup() simplifies the code and avoids the warning. Signed-off-by: Arnd Bergmann Acked-by: Marek Vasut Signed-off-by: Brian Norris Signed-off-by: Arnd Bergmann --- drivers/mtd/maps/pmcmsp-flash.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c index f9fa3fad728e..2051f28ddac6 100644 --- a/drivers/mtd/maps/pmcmsp-flash.c +++ b/drivers/mtd/maps/pmcmsp-flash.c @@ -139,15 +139,13 @@ static int __init init_msp_flash(void) } msp_maps[i].bankwidth = 1; - msp_maps[i].name = kmalloc(7, GFP_KERNEL); + msp_maps[i].name = kstrndup(flash_name, 7, GFP_KERNEL); if (!msp_maps[i].name) { iounmap(msp_maps[i].virt); kfree(msp_parts[i]); goto cleanup_loop; } - msp_maps[i].name = strncpy(msp_maps[i].name, flash_name, 7); - for (j = 0; j < pcnt; j++) { part_name[5] = '0' + i; part_name[7] = '0' + j; From patchwork Fri May 5 19:47:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98694 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292859qge; Fri, 5 May 2017 12:48:45 -0700 (PDT) X-Received: by 10.99.171.15 with SMTP id p15mr5360622pgf.121.1494013725007; Fri, 05 May 2017 12:48:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.44; Fri, 05 May 2017 12:48:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755748AbdEETsj (ORCPT + 6 others); Fri, 5 May 2017 15:48:39 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:53930 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755562AbdEETsc (ORCPT ); Fri, 5 May 2017 15:48:32 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LsLA8-1e3xiH1FFI-011ztt; Fri, 05 May 2017 21:48:21 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Atsushi Nemoto , Brian Norris , Arnd Bergmann Subject: [PATCH 3.16-stable 43/87] mtd: maps: rbtx4939-flash: delete an unused variable in rbtx4939_flash_remove Date: Fri, 5 May 2017 21:47:01 +0200 Message-Id: <20170505194745.3627137-44-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:/xjI9CtLZ4nphEM5mXz1QYcai/eKlcw+qB9SFOsSnqAiFNvnXIb vF5+NAYUqRI86b2IrmRAYt3iHEmT3tNgw0oaLqyeA3QVF7V7cpzO6eTSMg5XVyBS4RWllEn 9MX9r10o7xGzKqD9gbCfx8Oy8DRn0tJXkoDoeX2TGqhtwCXYVWLc8S19zdZldxelxW47TJE G0x4lNa7sDUqpWlwCo2xw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ac0Yl4JPKXQ=:VV3cvgUbikgfE5QRIa+In1 1u6GbBwNODxpaJPNlMcrZQ+Y84MVnKltoLf3NwbAXt45GhbRjrU0DbBTKxYkLfykfv4tlU4/q LZu7Z7VN3qxn8vV1Pqm0q0+q3PWmLf/MRVKACaZlgPef6X93EnjdxJJ/fovpLKdQX0KBEZLaB fbf+mfKA/xRkpmBdzpPwMhRculcn8LQ/GCwCIvZlOjUeVeJMus+wWnzZ2tgnbi++f4KxJntUY gT/DtCVi5wX7enc8D0L53LAF6V+RRcOE51eSSDbLdKEMpStjgEohjV+CJGLNnjMuW7WbIv6PE JoSuXaQRXZ0M03cAcSH5x78lI4ShqLJI7UW60+bXALUKURLD140FD/hK7TpZuRDsI0gBppHNR 9IuGn63MAYFXtMElCJ8YU3qpptZOjn8b21qZwEkC/BpK45JuHZmjMSjG0luerjEHn9xwsP1BT 1P4lwUnuS++R/HxohFOUa+7A9YDrqFIzcx7bVxs5B0zh29UcvJP+s+vtwnJEpvMAwx3Q8NQs+ 87dbINr5PFeV3c+WDqfhDEypMzAjWNkCGl7iuVM+ltzA0/iIcYKLKnpB2elH6x9//hsnaOA/q I0xvP1PIM1jhyWqevT6G4VgI695JMxPG6CFlom4f8V3FhlkDPllF94XfbtImFRjiVI5pVtNxr ljYHCwBNdNcvdtj8YnZqp/abihDYjH2y5ErrXrhihddlibxX+8+pSAdXGv4vCK26CcjI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Atsushi Nemoto Commit 939f9d8ee0aa99d7cb44af8de8eed13333ceb2ed upstream. Signed-off-by: Atsushi Nemoto Signed-off-by: Brian Norris Signed-off-by: Arnd Bergmann --- drivers/mtd/maps/rbtx4939-flash.c | 2 -- 1 file changed, 2 deletions(-) -- 2.9.0 diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c index 146b6047ed2b..a84fdfb10518 100644 --- a/drivers/mtd/maps/rbtx4939-flash.c +++ b/drivers/mtd/maps/rbtx4939-flash.c @@ -35,8 +35,6 @@ static int rbtx4939_flash_remove(struct platform_device *dev) return 0; if (info->mtd) { - struct rbtx4939_flash_data *pdata = dev_get_platdata(&dev->dev); - mtd_device_unregister(info->mtd); map_destroy(info->mtd); } From patchwork Fri May 5 19:47:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98695 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292861qge; Fri, 5 May 2017 12:48:45 -0700 (PDT) X-Received: by 10.84.241.77 with SMTP id u13mr7151930plm.28.1494013725287; Fri, 05 May 2017 12:48:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.45; Fri, 05 May 2017 12:48:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755753AbdEETsj (ORCPT + 6 others); Fri, 5 May 2017 15:48:39 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:50153 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755587AbdEETsd (ORCPT ); Fri, 5 May 2017 15:48:33 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MWKgT-1dZYeC2W4H-00XJv2; Fri, 05 May 2017 21:48:21 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, =?utf-8?q?Manuel_Sch=C3=B6lling?= , "David S . Miller" , Arnd Bergmann Subject: [PATCH 3.16-stable 44/87] xilinx: Fix compiler warning Date: Fri, 5 May 2017 21:47:02 +0200 Message-Id: <20170505194745.3627137-45-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:h74LyHSPKh2F6d85+FREwI7ludyiwRbstYkoGRMPOIEfS9wkivx QjD7mzpoNKgNtvLy5bsrh5czqvAPbm3dPJlLLs1N2Cc7L9X6HC576NhqShX+rd1UUqrDAde DzY8ggCc+rFV2a4M1uaa/blP7Pa5QOXEIk7u1BCCyZbC4r2PQ4JBQiu4kTXfSF9JvmSilfB Osyxrydfgl629g51tQigw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ubrB5mNvrgA=:DzG2ocG/o+o1mt11NWp5Bu bcacTBe3/zPq46Img8dHfaFZylHahHnAuj106DEDXkxvJAEFpNA3Z0alEuGFvqi0ebRm60qyl nLcHXg1Kn5bPnvMNtCW2ErsVn7kVY1agbf+dcoh1FoxSSz2aD+mV4K6yVpkAIbQIe5yALmTld AFOjv4GIgW+xA7AKd+XY1/S7X/X1fEPJwIr+hXAuYts56yQ2f9qsenYf4y2dfhctRiG7KRI66 QB8xZap0BJKwoZ5wMpwCP2wxwhdSWyJS5r7RI67H9Xr93Zi++J34Xr0bhSj9OCqHTTHBvtHUQ my6XZlCwA3Nn1GbtF86wYaoAe1K4elRZpU6ryUct8jPVFo4WFzGFSdastQdeuR0BUthdCoEE5 V2AqAsc2y/aG9TdC9gCGEDKWEi38snzrwzf8ax/KfuoLV7mRAbp1w+vFE8lRHilhdYDOsGeT7 OvJtkRxVBfDH+zl32vDr7X7UaleEsg6bc2+MZo0M20S0PPRKi00/H31jfZVbgmAoYfzQHCD3v jbPiP3y/V5GnGmEtRVytFLHgGAhOQOQkWkoabTj7HxwsAwaNvSrLtBjVRNYVd1dUds0D3SOA+ 8Bsnl3a/WQhFLCMjI2BJAlKdYeD0Zx8a9/68HCUWvAMuh8/pBgUcIYO+xMXelEFq+wziGiPm2 u0XoWCV2HM1Pxci+LwE3kEWFO23flbqI0m7fYc2TdG/9GtFHtey/4a3AlMgivCL1T/fhcEU4k qh74R7RNHBE+uh0g Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Manuel Schölling Commit b2daccdc2f728b20850bffbe4e22241dfc2dca59 upstream. The time comparsion functions require arguments of type unsigned long instead of (signed) long. Signed-off-by: Manuel Schölling Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 4ef818a7a6c6..8a6e5c2d6f95 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -72,7 +72,7 @@ void temac_iow(struct temac_local *lp, int offset, u32 value) int temac_indirect_busywait(struct temac_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) { if (time_before_eq(end, jiffies)) { diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c index d4abf478e2bb..3b67d60d4378 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c @@ -19,7 +19,7 @@ /* Wait till MDIO interface is ready to accept a new transaction.*/ int axienet_mdio_wait_until_ready(struct axienet_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) & XAE_MDIO_MCR_READY_MASK)) { if (time_before_eq(end, jiffies)) { diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 06b5e4132040..af36c7b560df 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -707,7 +707,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) static int xemaclite_mdio_wait(struct net_local *lp) { - long end = jiffies + 2; + unsigned long end = jiffies + 2; /* wait for the MDIO interface to not be busy or timeout after some time. From patchwork Fri May 5 19:47:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98733 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293583qge; Fri, 5 May 2017 12:50:30 -0700 (PDT) X-Received: by 10.84.229.10 with SMTP id b10mr67650635plk.148.1494013716223; Fri, 05 May 2017 12:48:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.36; Fri, 05 May 2017 12:48:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755569AbdEETse (ORCPT + 6 others); Fri, 5 May 2017 15:48:34 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:62793 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755324AbdEETsa (ORCPT ); Fri, 5 May 2017 15:48:30 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M007w-1du1Xu1PA4-00uG8n; Fri, 05 May 2017 21:48:22 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Joe Perches , Jeff Kirsher , Arnd Bergmann Subject: [PATCH 3.16-stable 45/87] i40e: Reduce stack in i40e_dbg_dump_desc Date: Fri, 5 May 2017 21:47:03 +0200 Message-Id: <20170505194745.3627137-46-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:pg38+yWIQ0u5AA9P/XooNbYiN/2/Piz3flH2BAHp9Pmj1VzYTXG qLRdeSeL4nu5KwCZfSwbGolH0x15mwSGzrlUGzo3HVQBZivCLpODCQgBwPfh4ap+WZLLjTY V+4y584FQQo+eTIXw76Z8IDyunG+D9noS1lfC5fFHVbSrlhcTT8ErXallkt31faI/jPomRj CFsZmhDS149J2aWkV7R5Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:Agn5VPcmTjg=:kzb0sLJITV1usEfhqbfW4w X+nl3MVTic1wFjwocpoAGR1qQkNowQjiNLny5Mv1A90I25CMXibz8XxyFTiBFTSfE4bvHH6Pq a1643aiDp4K+ILhk6SZdlKXPyKdSz5R81beAPhByU0IyWa7PA82r8Q+xWjX1tWKDG0masQM3c 4uwdOtZzjjBLyY5qxKdnLoeeQ2o8xWZzYZYAfxjZ5D9QMosITbHEqUtftjyWvl+Pt8tURcLML SZGSGqOFv4/XT6q4VYSX7+DPQgzG9GLK7p9+DPQklZMvLlizgmRc19etS6W6DmfLxul13MhLj ztEwoyuCYBJJcN+QjiGD70aBhvO7mtVVHxGh6ENxS06m+R9XJDFfkr3nCg9a3Jf9WHEbRkG7V G/ySupRTkLe7eGepfPPREZDhKJiv2wZWZLbrpiw4VqZpIHIjxmpu9EVhlZtw1GQobe4ulzItK IARvnDGOrNgubi/k4edaXnEqx27MgJtjKu91ZEJgfqb8Q6gvwQDgMP4D+r8+zuoJMlHKeF4Cr bN7TmaC5tJv9iuv0mZ26QciNdVTgMXZXEub4Lm+uNWN5cGitK6Sqe1jhauFpBxsKVBMvQRQOT vGWp6EKxe5p8rLaa9UxsOiMBnbysJ4S9u0ND/ZWWyLipZcxvTTLa68b2DNpgkx5AxRXLiWgWk U6ub1GvfcVyvybIxcqIqgPLVx/ssj8mnn2UsfzcD2A228WO8j8U5xEHmOVn9SC7p4M6/hsDwJ ZHPLDuBEfuTj+4WU Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Joe Perches Commit 1ddc2c00fdb275fcbb99a5585a6431f074cc0bc4 upstream. Reduce stack use by using kmemdup and not using a very large struct on stack. In function ‘i40e_dbg_dump_desc’: warning: the frame size of 8192 bytes is larger than 2048 bytes [-Wframe-larger-than=] Signed-off-by: Joe Perches Tested-by: Jim Young Signed-off-by: Jeff Kirsher Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 30 +++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c index cffdfc21290f..decf6faaa89d 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c @@ -754,7 +754,7 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n, { struct i40e_tx_desc *txd; union i40e_rx_desc *rxd; - struct i40e_ring ring; + struct i40e_ring *ring; struct i40e_vsi *vsi; int i; @@ -773,29 +773,32 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n, vsi_seid); return; } - if (is_rx_ring) - ring = *vsi->rx_rings[ring_id]; - else - ring = *vsi->tx_rings[ring_id]; + + ring = kmemdup(is_rx_ring + ? vsi->rx_rings[ring_id] : vsi->tx_rings[ring_id], + sizeof(*ring), GFP_KERNEL); + if (!ring) + return; + if (cnt == 2) { dev_info(&pf->pdev->dev, "vsi = %02i %s ring = %02i\n", vsi_seid, is_rx_ring ? "rx" : "tx", ring_id); - for (i = 0; i < ring.count; i++) { + for (i = 0; i < ring->count; i++) { if (!is_rx_ring) { - txd = I40E_TX_DESC(&ring, i); + txd = I40E_TX_DESC(ring, i); dev_info(&pf->pdev->dev, " d[%03i] = 0x%016llx 0x%016llx\n", i, txd->buffer_addr, txd->cmd_type_offset_bsz); } else if (sizeof(union i40e_rx_desc) == sizeof(union i40e_16byte_rx_desc)) { - rxd = I40E_RX_DESC(&ring, i); + rxd = I40E_RX_DESC(ring, i); dev_info(&pf->pdev->dev, " d[%03i] = 0x%016llx 0x%016llx\n", i, rxd->read.pkt_addr, rxd->read.hdr_addr); } else { - rxd = I40E_RX_DESC(&ring, i); + rxd = I40E_RX_DESC(ring, i); dev_info(&pf->pdev->dev, " d[%03i] = 0x%016llx 0x%016llx 0x%016llx 0x%016llx\n", i, rxd->read.pkt_addr, @@ -804,26 +807,26 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n, } } } else if (cnt == 3) { - if (desc_n >= ring.count || desc_n < 0) { + if (desc_n >= ring->count || desc_n < 0) { dev_info(&pf->pdev->dev, "descriptor %d not found\n", desc_n); return; } if (!is_rx_ring) { - txd = I40E_TX_DESC(&ring, desc_n); + txd = I40E_TX_DESC(ring, desc_n); dev_info(&pf->pdev->dev, "vsi = %02i tx ring = %02i d[%03i] = 0x%016llx 0x%016llx\n", vsi_seid, ring_id, desc_n, txd->buffer_addr, txd->cmd_type_offset_bsz); } else if (sizeof(union i40e_rx_desc) == sizeof(union i40e_16byte_rx_desc)) { - rxd = I40E_RX_DESC(&ring, desc_n); + rxd = I40E_RX_DESC(ring, desc_n); dev_info(&pf->pdev->dev, "vsi = %02i rx ring = %02i d[%03i] = 0x%016llx 0x%016llx\n", vsi_seid, ring_id, desc_n, rxd->read.pkt_addr, rxd->read.hdr_addr); } else { - rxd = I40E_RX_DESC(&ring, desc_n); + rxd = I40E_RX_DESC(ring, desc_n); dev_info(&pf->pdev->dev, "vsi = %02i rx ring = %02i d[%03i] = 0x%016llx 0x%016llx 0x%016llx 0x%016llx\n", vsi_seid, ring_id, desc_n, @@ -833,6 +836,7 @@ static void i40e_dbg_dump_desc(int cnt, int vsi_seid, int ring_id, int desc_n, } else { dev_info(&pf->pdev->dev, "dump desc rx/tx []\n"); } + kfree(ring); } /** From patchwork Fri May 5 19:47:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98735 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293674qge; Fri, 5 May 2017 12:50:45 -0700 (PDT) X-Received: by 10.99.152.18 with SMTP id q18mr5258610pgd.54.1494013728315; Fri, 05 May 2017 12:48:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.47; Fri, 05 May 2017 12:48:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754060AbdEETsq (ORCPT + 6 others); Fri, 5 May 2017 15:48:46 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52225 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755672AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LisgQ-1dd2cq2PgE-00dHWN; Fri, 05 May 2017 21:48:22 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 46/87] mlx5: avoid build warnings on 32-bit Date: Fri, 5 May 2017 21:47:04 +0200 Message-Id: <20170505194745.3627137-47-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:wiNSzntpChTkXRUvHqOIVv+kFVuugibfsN4iWj9TA+XmmdYOYyN PjBanb0IHZ9vEQ7eGzgTY46T6oyRccBvC47Ech5VIn1W8BUqyhbOoqvkuK016bKsrQ8Id++ lBqIwnQyoSE0Ie4C+HpeCm8JiaVqxRHjsdQRYTmVHgXx5YGK6wCW2ej9i5UONJSclo+SW6U bS10O+lM03+h9bElEVjiw== X-UI-Out-Filterresults: notjunk:1; V01:K0:S2X170p9Tyg=:ZYwo9uAhmU4Bhyhu/ptfY5 vjcReqF2hfbm6Up0X41JctYNS+WStlap/khvwup2oFcJOUjDTivyHjlyuDqmvWNLava+UgttW QkGOBFh1hAorVw7E8+pUjhAWYpgCY2YjKlbczbJ9k7F930GrtP961RdEB2u+p3S1FnbVpfjSS Gq3IN2Vkt2yUiErsNbPzlCkCfSb3pz2aZQYpJct/Zjfvi5SKz82wBjE5nmpK8T9H9yz35U/jE Bh2entCg6Q4ABIhu/RHVtBfkJIq5Z4K2zu3l67KJJh7uZUHXAH0DbRQp4nHAXg30vB786LU87 sGIrRVPPPpvaRLuSIcqGPk+iy+ElpW4eo23nE2is9oRpgZ7x117nQAg1uG18RkOk9NiB7bdtZ dTr2i61vQ7D7jrsc49T5SK1YURaR1apbiHF+JOnmVI84vtj/rZvvMk4qgoWt9NRQusehUenRX V8iGAnAXixuo7rlE3aA+K03eD9pXbbFqk1uSO2jTqpSR1ksE+xLjBa1Gb9qynr4av7H+JrmHY Xi0UCZiWctSC7lkacq87W7NzINTWbz0VkgN7DyxzPHk1LafDsjgx03/6/GIm+pLQSHDeH5K0M AnjJldeRbUzU1mE8AWUntbZfbvuTijKv+aoufWBtofKkWY8QH9dyX0xrX9Rz7Cp+c4tQ3HQPk Q/Too2LwwRYMISDZK4M0Vneh5ppTxN2r+OexTkz6vgCAloUNfC5F/BDu/YfnGv3JS4SM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 07fd45564be5acb2667ab76d8c075886377928a5 upstream. The mlx5 driver passes a string pointer in through a 'u64' variable, which on 32-bit machines causes a build warning: drivers/net/ethernet/mellanox/mlx5/core/debugfs.c: In function 'qp_read_field': drivers/net/ethernet/mellanox/mlx5/core/debugfs.c:303:11: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] The code is in fact safe, so we can shut up the warning by adding extra type casts. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c index 10e1f1a18255..4878025e231c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c @@ -300,11 +300,11 @@ static u64 qp_read_field(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp, param = qp->pid; break; case QP_STATE: - param = (u64)mlx5_qp_state_str(be32_to_cpu(ctx->flags) >> 28); + param = (unsigned long)mlx5_qp_state_str(be32_to_cpu(ctx->flags) >> 28); *is_str = 1; break; case QP_XPORT: - param = (u64)mlx5_qp_type_str((be32_to_cpu(ctx->flags) >> 16) & 0xff); + param = (unsigned long)mlx5_qp_type_str((be32_to_cpu(ctx->flags) >> 16) & 0xff); *is_str = 1; break; case QP_MTU: @@ -464,7 +464,7 @@ static ssize_t dbg_read(struct file *filp, char __user *buf, size_t count, if (is_str) - ret = snprintf(tbuf, sizeof(tbuf), "%s\n", (const char *)field); + ret = snprintf(tbuf, sizeof(tbuf), "%s\n", (const char *)(unsigned long)field); else ret = snprintf(tbuf, sizeof(tbuf), "0x%llx\n", field); From patchwork Fri May 5 19:47:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98684 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292769qge; Fri, 5 May 2017 12:48:31 -0700 (PDT) X-Received: by 10.99.126.92 with SMTP id o28mr5453661pgn.63.1494013711768; Fri, 05 May 2017 12:48:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.31; Fri, 05 May 2017 12:48:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755571AbdEETsa (ORCPT + 6 others); Fri, 5 May 2017 15:48:30 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:62658 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754515AbdEETs2 (ORCPT ); Fri, 5 May 2017 15:48:28 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MDHpc-1dGeJm3L00-00Gbsf; Fri, 05 May 2017 21:48:22 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 47/87] mISDN: avoid arch specific __builtin_return_address call Date: Fri, 5 May 2017 21:47:05 +0200 Message-Id: <20170505194745.3627137-48-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:/szpWEsBna273ap2AitJicos2T9b+Y5GogeZyjxKYUiQIIcHuS0 PtF07bOrAIXh4m5m2mW+KXQMfVM+Ji191ej7NIgQbbA9PZ32x1WZFZqi1zlabUIgy2MnlXM YwGzNM5w5f8BwX57D1FDvNjYh2lg940n0cBAEO/SKvBWgM5mMIUrDVuymMM1EwFTA/pYBzb ADkezsw2P6LIhlEu3S6wg== X-UI-Out-Filterresults: notjunk:1; V01:K0:aTGxLatF0a0=:U7YF4pE2YYU4IMAdvAoaqy YBuLIBJbw6fnOl8dOe17u8tw43Hxb+k30+Y3nttd7xI1RypPOZcXJoq4lE5We0wFD6I2i74GE H7VU6K5ltplQ7a6p8ubiCW2bTpdLT04n9QBFcQ/dHoPIJnLlac4RY7dSB9jsPLk0p/Z0vfNO3 qfeBOoCXSD9pyv7BkSp9hST4p21E1vcT9b/FxW/P//HV64f8/xu6SOjcK3AA73Qfq1UWxKc3l D4bqNzS4lFPiqh96X9FSn3xziqmTUdS/3upvsSOqCR8SLwFkwPryhbJJwrWkiz+6pIHSRsqBe 5vybMJpnjVyr+ITkNOL38sfaRmS95o064Qoz/nSqUIgQnc7HeFzKJr7Xxblpwxh3EUiE9Vo0t e/wnv6NU5JtWgVb/MDYvSw3hDOlS6cmLnO1QGhuJQM7q9iKWh2RB3ZcikNhYTpOhnOX7c5SeN Nl5mbgOi6WLgTm9LIF+RwTDltoYIzBjPgsKwN2D1ZVV0NUQN4tYQc8dW6xwygMw9XZiE9riiY KKCdqSvNsd1AstJUMT8XeqOQ4dCb41cONZDfV98nknBDoMNLp0/rM3Is1yn4tOLCdHAsf9o7u kQScPOJaiR4UMm2KRInx70GmkB7R8/UuhCKMeehLAPUMP0DbrxyWFsLPnevQC51emHk4K9Y/k 1fMSCA4985hb/E1nzpdWivgZCUnC75lG1sOFzQ5/BXxMJhT5cxf8+Zzs/5RgSRtBpxxo= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 3e7a8716e20b759eec0ad88145255bb33174f0c8 upstream. Not all architectures are able to call __builtin_return_address(). On ARM, the mISDN code produces this warning: hardware/mISDN/w6692.c: In function 'w6692_dctrl': hardware/mISDN/w6692.c:1181:75: warning: unsupported argument to '__builtin_return_address' pr_debug("%s: %s dev(%d) open from %p\n", card->name, __func__, ^ hardware/mISDN/mISDNipac.c: In function 'open_dchannel': hardware/mISDN/mISDNipac.c:759:75: warning: unsupported argument to '__builtin_return_address' pr_debug("%s: %s dev(%d) open from %p\n", isac->name, __func__, ^ In a lot of cases, this is relatively easy to work around by passing the value of __builtin_return_address(0) from the callers into the functions that want it. One exception is the indirect 'open' function call in struct isac_hw. While it would be possible to fix this as well, this patch only addresses the other callers properly and lets this one return the direct parent function, which should be good enough. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/isdn/hardware/mISDN/mISDNipac.c | 12 +++++++++--- drivers/isdn/hardware/mISDN/w6692.c | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c index 92cf6fcd20ac..cb428b9ee441 100644 --- a/drivers/isdn/hardware/mISDN/mISDNipac.c +++ b/drivers/isdn/hardware/mISDN/mISDNipac.c @@ -754,10 +754,10 @@ dbusy_timer_handler(struct isac_hw *isac) } static int -open_dchannel(struct isac_hw *isac, struct channel_req *rq) +open_dchannel_caller(struct isac_hw *isac, struct channel_req *rq, void *caller) { pr_debug("%s: %s dev(%d) open from %p\n", isac->name, __func__, - isac->dch.dev.id, __builtin_return_address(1)); + isac->dch.dev.id, caller); if (rq->protocol != ISDN_P_TE_S0) return -EINVAL; if (rq->adr.channel == 1) @@ -771,6 +771,12 @@ open_dchannel(struct isac_hw *isac, struct channel_req *rq) return 0; } +static int +open_dchannel(struct isac_hw *isac, struct channel_req *rq) +{ + return open_dchannel_caller(isac, rq, __builtin_return_address(0)); +} + static const char *ISACVer[] = {"2086/2186 V1.1", "2085 B1", "2085 B2", "2085 V2.3"}; @@ -1547,7 +1553,7 @@ ipac_dctrl(struct mISDNchannel *ch, u32 cmd, void *arg) case OPEN_CHANNEL: rq = arg; if (rq->protocol == ISDN_P_TE_S0) - err = open_dchannel(isac, rq); + err = open_dchannel_caller(isac, rq, __builtin_return_address(0)); else err = open_bchannel(ipac, rq); if (err) diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c index de69f6828c76..741675525b53 100644 --- a/drivers/isdn/hardware/mISDN/w6692.c +++ b/drivers/isdn/hardware/mISDN/w6692.c @@ -1176,10 +1176,10 @@ w6692_l1callback(struct dchannel *dch, u32 cmd) } static int -open_dchannel(struct w6692_hw *card, struct channel_req *rq) +open_dchannel(struct w6692_hw *card, struct channel_req *rq, void *caller) { pr_debug("%s: %s dev(%d) open from %p\n", card->name, __func__, - card->dch.dev.id, __builtin_return_address(1)); + card->dch.dev.id, caller); if (rq->protocol != ISDN_P_TE_S0) return -EINVAL; if (rq->adr.channel == 1) @@ -1207,7 +1207,7 @@ w6692_dctrl(struct mISDNchannel *ch, u32 cmd, void *arg) case OPEN_CHANNEL: rq = arg; if (rq->protocol == ISDN_P_TE_S0) - err = open_dchannel(card, rq); + err = open_dchannel(card, rq, __builtin_return_address(0)); else err = open_bchannel(card, rq); if (err) From patchwork Fri May 5 19:47:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98685 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292777qge; Fri, 5 May 2017 12:48:32 -0700 (PDT) X-Received: by 10.84.224.140 with SMTP id s12mr48334039plj.169.1494013712735; Fri, 05 May 2017 12:48:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.32; Fri, 05 May 2017 12:48:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755591AbdEETsb (ORCPT + 6 others); Fri, 5 May 2017 15:48:31 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:58029 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755562AbdEETs2 (ORCPT ); Fri, 5 May 2017 15:48:28 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lo5sn-1diFpO08hF-00gICK; Fri, 05 May 2017 21:48:23 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 48/87] cpmac: remove hopeless #warning Date: Fri, 5 May 2017 21:47:06 +0200 Message-Id: <20170505194745.3627137-49-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:taestTvNV+2ikLRCBiYokoo3JMdP09YDOE6NWfRgelPWXiyZNKz d/kcCyeGON8hgDgxmE52gPW1HODocDCVPv1dj60dU12VAfuol+T89DmzcoMUQLVgx8rDIhO YGjCLxEo7URdw5+Zn53xZpphBRWjhgkD6BLdt258kj85jYWkNX2yDwBS7CQca94o716DDXG Htbhr5FaFl9e4RZM/xrGQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:vzUI2nU/m9w=:XbyXBw2LxlQWbMXDI3Uow+ y5dxRq18T8LXsIG6wOk8o94NUN5dyGsJSu8Z1pxDhLIaQy9t1caz+Sv1G27cCR8XFMGUM0UJx EuXxm9GoqnO7k7ncw+10gX67QkKgZvcQKIGVGPiJyninaBFGlikNe/zXdaO7s5dCO9K1qwjwq WxiskyK0Ko15ZqxYlERlGdd2ZnD78u3g8NOlZVnoGWHSe0FX+wLWk6e1CN2+tcKIzhXVgxVHj GjglvNhTszAepjtknUHI7PN/XhFaSkrYHFxMDJ+dqvQIAK7di78sLwDnjDWaWZBOmwXDqeE4C 48Gy3/XWJBIBcKD5lQd9vdWt991WKTsJStYpH5rAIEQuiHn+wc2Jabj8n62YdrOlK2Z4XjaWr LxkWe1diiPj2jCeRp2v3patBQR4cREspUCPjK9eHM/Sp1keJqwK53cIzJiWvuhIABhqVMwQwp qgC1z9HZw8lF+SsynBc8xuDLsmA6ZP6HyBOJswlhfzg9CmpbmBxrrEVHRKtU5X/1FsilNHTZ6 LontdV/B123GjJ+PDm5r4FkptnQeI7CpniO+zoi2maThfYlmR5L394NJ2pIsLHvSjfZJ9to28 Hv+Z3GIgPSrEO2wc9Y3R2Nci7PeSsyOqK3OKINwxORTDW1v/jrotzKQz/WPD8AUgo8vYR9cSP LNJqO37cUe09CiJdV90jB+bg8kw5r8En1CPpksR5aHH13o6F70cyzI4cXnJYAMLPSJE8= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 4ce83574a7310d893cdb1e0a8cabe77b0efc8e58 upstream. The #warning was present 10 years ago when the driver first got merged. As the platform is rather obsolete by now, it seems very unlikely that the warning will cause anyone to fix the code properly. kernelci.org reports the warning for every build in the meantime, so I think it's better to just turn it into a code comment to reduce noise. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/ti/cpmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c index 7399a52f7c26..44d5a7bee0d7 100644 --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c @@ -1226,7 +1226,7 @@ int cpmac_init(void) goto fail_alloc; } -#warning FIXME: unhardcode gpio&reset bits + /* FIXME: unhardcode gpio&reset bits */ ar7_gpio_disable(26); ar7_gpio_disable(27); ar7_device_reset(AR7_RESET_BIT_CPMAC_LO); From patchwork Fri May 5 19:47:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98702 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292918qge; Fri, 5 May 2017 12:48:52 -0700 (PDT) X-Received: by 10.84.230.135 with SMTP id e7mr68501073plk.20.1494013732207; Fri, 05 May 2017 12:48:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.52; Fri, 05 May 2017 12:48:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755763AbdEETsu (ORCPT + 6 others); Fri, 5 May 2017 15:48:50 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:58629 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755483AbdEETse (ORCPT ); Fri, 5 May 2017 15:48:34 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MZKwe-1dKxmF1Knc-00KvK5; Fri, 05 May 2017 21:48:23 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 49/87] net: caif: fix misleading indentation Date: Fri, 5 May 2017 21:47:07 +0200 Message-Id: <20170505194745.3627137-50-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:Ujycg6J6/WnxTv0PLM7OuuLXACjhuBL9Kn/dILU/UYE43qWLXVn Lbhw/YxV2x2d42pi8Dxw1bTIc4p/T0ukFYSSfjpwKi4f66Fd83uf/dAfu6FjVEg/FiG6KBB L5R60erwMBp1YlF8Nbyj/rlmoq6IM28S1o92nz2hw7/yhQGwI/onaMO+1Aq4hxkBo/mGUez +fsTF7V2zs6dE2137cxow== X-UI-Out-Filterresults: notjunk:1; V01:K0:qXc8secqP+A=:gumc0ntNdpPlxvks78xvVQ bYp7BE1cUrupKeUvTJ0GN4i9oGOQin+Ohm8LYSUv3qwUiGxfJtW1SmzxN5l/gQfLDYbU1ERIM Y/1GlFB5ptx3+2hLIPLcl1SarLdoITLkhVYuyyXG2Db8U4rcdErCL61znLXvx+6JSlPqWiIIZ i0O53PA9N1BIfCwm9rKc4nU6RlvN3MrQTks0SF0brl6LBdF1lZakxqRwwA1ZU2cyPv9yxmUGn M7Cv6B2mMOctilieKiUK/tdBi3CZIzEXXxJ9BHi+crpeENa2h/Rh9lgxAhzNoFQq53CETfAx4 sbLEAIkfgMhILZej5GUQujzeFfF747OJ+bBPZhNMvuhjMM0nb+uzCDSChC7aK+OkpfX87uvQi YUhZHGLUiXTDU8p9CVBbnZFS4Z39tSnuMpUH9LOzvEiX8jg/dPR5Q2ZZRGplEGGAgROG1jw3X ZaQahtRkVIYTy16i29Dw2hBfQBjp3gz3ziUQj/qpKgNwbTPHHeUBU1XJWnMVFINYho7SK8FXd YxTdbEIEBoDDMZn23sdSGZG9QlI7Z4f8mytmw48VQtaZ8AXM9JNzy7thwCUnr/PDQGp6V6+ts qnb3ee8qkCkVE3vphiv0sW0cFjtuFCBHTcFS5cV+/v+kDxA0zRiVNjrfv1RW+ZY21PhHsJaB6 qXJrrud+vkWOSDE/Yk60mGhTtxqhiktxR0KirlfeZ5wdNR6C4gsJY2wz+SqfZe/BMUls= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 8e0cc8c326d99e41468c96fea9785ab78883a281 upstream. gcc points out code that is not indented the way it is interpreted: net/caif/cfpkt_skbuff.c: In function 'cfpkt_setlen': net/caif/cfpkt_skbuff.c:289:4: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] return cfpkt_getlen(pkt); ^~~~~~ net/caif/cfpkt_skbuff.c:286:3: note: ...this 'else' clause, but it is not else ^~~~ It is clear from the context that not returning here would be a bug, as we'd end up passing a negative length into a function that takes a u16 length, so it is not missing curly braces here, and I'm assuming that the indentation is the only part that's wrong about it. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- net/caif/cfpkt_skbuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/net/caif/cfpkt_skbuff.c b/net/caif/cfpkt_skbuff.c index 1be0b521ac49..5add8e75759d 100644 --- a/net/caif/cfpkt_skbuff.c +++ b/net/caif/cfpkt_skbuff.c @@ -286,7 +286,7 @@ int cfpkt_setlen(struct cfpkt *pkt, u16 len) else skb_trim(skb, len); - return cfpkt_getlen(pkt); + return cfpkt_getlen(pkt); } /* Need to expand SKB */ From patchwork Fri May 5 19:47:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98731 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293497qge; Fri, 5 May 2017 12:50:16 -0700 (PDT) X-Received: by 10.84.217.218 with SMTP id d26mr44861427plj.47.1494013816869; Fri, 05 May 2017 12:50:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c5si2571475pga.119.2017.05.05.12.50.16; Fri, 05 May 2017 12:50:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756060AbdEETuL (ORCPT + 6 others); Fri, 5 May 2017 15:50:11 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:59143 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755597AbdEETss (ORCPT ); Fri, 5 May 2017 15:48:48 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LfsQF-1drdUq2VUB-00pg7K; Fri, 05 May 2017 21:48:23 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 50/87] net: am2150: fix nmclan_cs.c shared interrupt handling Date: Fri, 5 May 2017 21:47:08 +0200 Message-Id: <20170505194745.3627137-51-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:35sn5fi2IwtLiehEDZ2stXqhLOFXJ746jSpDcp/Cp6wHFVioTDT 7GdaQu3lrHzvHZqkykPcFDGmQA2TxCZ9Ezs9DoYgNe/Zs7cGlJbQf5OvKAjJd0glPPKqpUK GAjuqFqnoD4+JaaGrK6NKNqkzv5qwq4mGvvrnexcS6DO++J44XeapO/TMz0uOQlDSyZjzoD wOd/xzMMXbue8KZcjlQ1A== X-UI-Out-Filterresults: notjunk:1; V01:K0:54YtxV33FuE=:LfK2P+3X8pa1ZHUG5RGfUm hqcTyk2N6YfwTupJfi+J4vhiieAAg98eSncJgxIVrlYCorI2nSjJk5qaa6tHROjHBiBbrPwAF DWONul/mPvMI7Rk5dVr6mFe5tpXL8hOzJ2fIltlP4JBfOrKeaHX/HgpiSRf2G7l+H/f8caUEp fDDokjx7ZckMsTPOjq1Sa8GOgf+mjNVl2J1ofHxsgnje2xCMnd70NRmq/G2LanbF0Z4fCM0tn vuhhrciDu2GLSTa4SEA/LcbpwCPHyv61MWMv5VMLGOjCOd5SAFbfI18bevRjgmxmS/6fEdCWs K3eGVZIyMwc/TsVQyARMZ33IGbsXskEoyts+Gl1uoV6m+gzvPogU8Xi6Kabx4yyBwvl8FS80Q bveYgNLhKr+e7q5ZKRfmgBDRpMNXMmpFCN81pCM9RAvNae/sMh4agZBUy6qDvnnf7MfBfmE1F A1PdP5JFuJzkaJpaE8c12y8ZtycXgeO5g4CuMeMGgyA7e4LvtA51YGB99l0pEAPi5/tJ3tKSR cRqUDLHGp2zE9jr3l4Rgy7LLejb9k8mFnk2nqWzaG+CijlOs6m5aZuB/pNCUxdXK5+GanQ6vI vBXXMEtPMc7/6b51jsLG3Kj6PlMQe9qKsz0QuQpGHqh+5oQfU9acWtRdh01R9IwoKwGPHGvce +3JmldtFiErGlSCYM41onFoTJWtEVOnpEFG127oWYKm2uCmd2p7CYKpScD8aCCXrt9bg= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit ec48c4ad83d711f18daea527bb2c78d388cc5ef3 upstream. A recent patch tried to work around a valid warning for the use of a deprecated interface by blindly changing from the old pcmcia_request_exclusive_irq() interface to pcmcia_request_irq(). This driver has an interrupt handler that is not currently aware of shared interrupts, but can be easily converted to be. At the moment, the driver reads the interrupt status register repeatedly until it contains only zeroes in the interesting bits, and handles each bit individually. This patch adds the missing part of returning IRQ_NONE in case none of the bits are set to start with, so we can move on to the next interrupt source. Signed-off-by: Arnd Bergmann Fixes: 5f5316fcd08ef7 ("am2150: Update nmclan_cs.c to use update PCMCIA API") Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/amd/nmclan_cs.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c index abf3b1581c82..11cb05df749c 100644 --- a/drivers/net/ethernet/amd/nmclan_cs.c +++ b/drivers/net/ethernet/amd/nmclan_cs.c @@ -952,6 +952,8 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) do { /* WARNING: MACE_IR is a READ/CLEAR port! */ status = inb(ioaddr + AM2150_MACE_BASE + MACE_IR); + if (!(status & ~MACE_IMR_DEFAULT) && IntrCnt == MACE_MAX_IR_ITERATIONS) + return IRQ_NONE; pr_debug("mace_interrupt: irq 0x%X status 0x%X.\n", irq, status); From patchwork Fri May 5 19:47:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98732 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293560qge; Fri, 5 May 2017 12:50:27 -0700 (PDT) X-Received: by 10.99.106.5 with SMTP id f5mr5292163pgc.66.1494013732984; Fri, 05 May 2017 12:48:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.52; Fri, 05 May 2017 12:48:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755794AbdEETsv (ORCPT + 6 others); Fri, 5 May 2017 15:48:51 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:60331 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755676AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LmT35-1dgbve232B-00aFmo; Fri, 05 May 2017 21:48:25 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Jeff Kirsher , Roger Pao , "David S . Miller" , Arnd Bergmann Subject: [PATCH 3.16-stable 51/87] am2150: Update nmclan_cs.c to use update PCMCIA API Date: Fri, 5 May 2017 21:47:09 +0200 Message-Id: <20170505194745.3627137-52-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:B46bug6FJzYWmarZ6+yRqrFbYi4PTMZSGPGmQGJx+z/O6N2Igg2 jt2Ti4Bh7lVrjQMIWPlaGNPSgQK13hbjEoSxR1eVi8rbsxoeQhj+21a2ZVfK4LGQkywaI+l e4/TP6HSG4dqH5TGIXRoEd5YLXMGTuC5zDaXyJBaAFRul6401MKQcyayjFhfPQ1UXqPOoNT nQAs3wHiOnezuD9oB2VIg== X-UI-Out-Filterresults: notjunk:1; V01:K0:+gXe2qhKP64=:XbSvmRWfjlORFkX/L4OQPM NNiZ8zldVxZ0S8RznT/5I15wC0AUy8Pp9uMW5+hyd+1F5O6Y63wIQwzNoJskCTvYBT2C9cAOR 69yPzta6QTwC11MspFdKF4QqkfMmxKyi0BUPPMOPWISFC4bPQTsR8/Ac9YuPpbeEnQ6M8sunv m2PG9Yprt6B8xmmoqbxJtgi/H3ZoT1OpIZHCrKM3qp3fTke9dzrFrZMc1sdTUXy1hcqI7ba83 ubbIIUljpF6XciiKWGdZeE4z8MMl1qAErVNNx6mao++IbgzYo0EdLx1u3NBNeUVF17Rp/mFRn QOq0v0N5V0oPRSVZBPnxOUfmsnyJEXWQa2U8wV3vUcUR1EG4ndJYgpN/nJx2mqGCrFjLjNqUm TlO5k2VG4fED3hrkr0wtvLHE4HRIeyc+jPUgb0MH8d8P6MrVkgBK980VQbD6AbG6SDBi/HEIQ v1PwkZ/0lRPAvM4P+BgJFP+UZ4igMcFMoiqeHOJ+wWqVBWbEs57h1ljRGUk/I3Dey9XFDUGVG 178WoV+7FSCqAFkA40or6fsMHSdi99+PG3A3CtYCJ33J2TNOic8jAQpSYXdqJC2gD02JTViGD A0clKnWYVlSOAzxVeHDjnOhyA0c9RFiFWAGcOnHzl6s+eBtbH0Zn0JA3HYUOTOiO0mdtDBhUV yf2IMrtoY0TTWYglDIXWi5281f3h23IIMnsA1C8iKgLhtq2s6RE7CW3CZLQkAhfU2teSxqF/u /udCC+O0PvSUAsqS Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jeff Kirsher Commit c775bd73d40b6f15ff448754e5d801ae3634395e upstream. Resolves compile warning about use of a deprecated function call: drivers/net/ethernet/amd/nmclan_cs.c: In function ‘nmclan_config’: drivers/net/ethernet/amd/nmclan_cs.c:624:3: warning: ‘pcmcia_request_exclusive_irq’ is deprecated (declared at include/pcmcia/ds.h:213) [-Wdeprecated-declarations] ret = pcmcia_request_exclusive_irq(link, mace_interrupt); Updates pcmcia_request_exclusive_irq() to pcmcia_request_irq(). CC: Roger Pao Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/amd/nmclan_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c index 11cb05df749c..27245efe9f50 100644 --- a/drivers/net/ethernet/amd/nmclan_cs.c +++ b/drivers/net/ethernet/amd/nmclan_cs.c @@ -621,7 +621,7 @@ static int nmclan_config(struct pcmcia_device *link) ret = pcmcia_request_io(link); if (ret) goto failed; - ret = pcmcia_request_exclusive_irq(link, mace_interrupt); + ret = pcmcia_request_irq(link, mace_interrupt); if (ret) goto failed; ret = pcmcia_enable_device(link); From patchwork Fri May 5 19:47:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98690 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292818qge; Fri, 5 May 2017 12:48:38 -0700 (PDT) X-Received: by 10.84.178.129 with SMTP id z1mr1957159plb.44.1494013718156; Fri, 05 May 2017 12:48:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.37; Fri, 05 May 2017 12:48:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755645AbdEETsf (ORCPT + 6 others); Fri, 5 May 2017 15:48:35 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:65031 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbdEETsa (ORCPT ); Fri, 5 May 2017 15:48:30 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Mhqzr-1dTSlW3CTr-00MpXa; Fri, 05 May 2017 21:48:25 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 52/87] net: tulip: turn compile-time warning into dev_warn() Date: Fri, 5 May 2017 21:47:10 +0200 Message-Id: <20170505194745.3627137-53-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:lvSX31jUuUFK8I2rppuRECbjFElgLjEQtOz5+khYrW45lqgMrwO MaHYJv3KMuozdrch7BhpkJDrbZSqNgdnKeYwq6Y3aX/653oriLTzMwDbZMw0I8gevvcEKE7 DuB9qgw7GjtosIPBmCVvw5ThXobY0akfp4gWQsuSuuBVMZNFQLHgzTvMgI+aBFnK6oLd05E Jw78KyQe9n3yMAT+QmT4Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:QFAJLiXPf30=:/WmBRd5vAHgTLfIZcbasYF D0eWjgkYsACNGk6ipcZrKqnae4JhKvMcMr+To8On/ksWdx8ZUkkxqcX3vNVju2NhPc8coOe6O Mxa0xyTyQbXzNllK4oogZdIdv2KStUGGYhvaCPupdfuTBXPA61GpoUObxvnE9Nr8v3ed3+1d/ GanU6eE3iHX0wuivkcxrQoO0Nf5aM92hc6KZLzy9nFKEZjDBcSP+Ln291EX2PgirSSPWCOGhQ GOfbSK5dxLYklt5X5mU9ILvwjWnA5tz6M13esq3s17q3ujh0Nhmjx4cZ48gQpvBBSoKI1gq5Q GG/LCBAZsslOusGthhh1Y5+mWl9uZiPYn2CM0AXB/xy9Tpy1KDUsNOfKN2S0vqqezk33dt+S8 FJ2GiRKxfJzgXpM75tC++oiGxnq569zS1WqTp+3ELewKeHXsefVckz/9a6rh6twZ4OYJsQjKX K3SmG8c1Yi/jqeFE4fiLLwBdOCc+2e1tcIB+2BE6cPBWpzpdUePWiEMYyeSitfS9p/cFLrntZ cRFSUQn8F5XWEyY0PhQf8oTY/tyLBdBON788NhJYEai4IZq2WhWsvR4EzE18xK2BeA7E6hrn7 +459VP2CM5j8UP8pXqZKaVPddcU6m2M9khtTdgT9uOkcuMTaGo/NMZ87aUwfW27zGdW5ZvVGK GeO0XZHpJ0IVj6K873fQM35xs3q/gSWGW4og+GBMaQBZp1DkjtwknWQ/03oh++wTPfMI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 738cc2bfd9b0858122a60c07f228ec8807592602 upstream. The tulip driver causes annoying build-time warnings for allmodconfig builds for all recent architectures: dec/tulip/winbond-840.c:910:2: warning: #warning Processor architecture undefined dec/tulip/tulip_core.c:101:2: warning: #warning Processor architecture undefined! This is the last remaining warning for arm64, and I'd like to get rid of it. We don't really know the cache line size, architecturally it would be at least 16 bytes, but all implementations I found have 64 or 128 bytes. Configuring tulip for 32-byte lines as we do on ARM32 seems to be the safe but slow default, and nobody who cares about performance these days would use a tulip chip anyway, so we can just use that. To save the next person the job of trying to find out what this is for and picking a default for their architecture just to kill off the warning, I'm now removing the preprocessor #warning and turning it into a pr_warn or dev_warn that prints the equivalent information when the driver gets loaded. Signed-off-by: Arnd Bergmann Acked-by: Grant Grundler Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/dec/tulip/tulip_core.c | 9 +++++++-- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 861660841ce2..eab3142bd795 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -98,8 +98,7 @@ static int csr0 = 0x01A00000 | 0x4800; #elif defined(__mips__) static int csr0 = 0x00200000 | 0x4000; #else -#warning Processor architecture undefined! -static int csr0 = 0x00A00000 | 0x4800; +static int csr0; #endif /* Operational parameters that usually are not changed. */ @@ -1982,6 +1981,12 @@ static int __init tulip_init (void) pr_info("%s", version); #endif + if (!csr0) { + pr_warn("tulip: unknown CPU architecture, using default csr0\n"); + /* default to 8 longword cache line alignment */ + csr0 = 0x00A00000 | 0x4800; + } + /* copy module parms into globals */ tulip_rx_copybreak = rx_copybreak; tulip_max_interrupt_work = max_interrupt_work; diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 62fe512bb216..345f2fe8755c 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -907,7 +907,7 @@ static void init_registers(struct net_device *dev) #elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC) i |= 0x4800; #else -#warning Processor architecture undefined + dev_warn(&dev->dev, "unknown CPU architecture, using default csr0 setting\n"); i |= 0x4800; #endif iowrite32(i, ioaddr + PCIBusCfg); From patchwork Fri May 5 19:47:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98689 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292815qge; Fri, 5 May 2017 12:48:37 -0700 (PDT) X-Received: by 10.99.115.14 with SMTP id o14mr5212276pgc.31.1494013717805; Fri, 05 May 2017 12:48:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013717; cv=none; d=google.com; s=arc-20160816; b=wsGqUupZarXy+Ct8J/zjjLtdUKSe4VyfDi+dhX7pdhFmTUOsUkVmpIwUQ6K7x6FFj9 CCuLL557Eoi0dqjAs9Qfxc8JI5ZAnFXxkiaj8PcN0czHWIr4KGQAqUC+GFxdU2eUqx5v P3YKlgjLVSq1JNZVpfCoEAOv/Mm3S16eLHjw2+qPYapSdxyQeRjf5KTC44KaSrJb/5oU XRsqISPfEcQA55jizI7GVMSG0sOoQgdhTJgNYnXQagNRfFkQY+h+gLXbwC375GtpT1Uh tx8bWtCBXvqqt+AotaeKAyo+FDcaYWR6XsyXn0H7BMlO5A5Jv0EfEIu8d0H9bIBsIrDh SUAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=nZ8fwT5V/pIN25etywuaJhUcQ96yU+D7iMLaRpleqmE=; b=cCZ/aSBiyevOkUQfHscgqBME2dRLELE1lSNWjGoIMt8y5smS83bH0RRH+vbL5zW49i FHF8oivyq5qQTYHZDMpfnGVQffP4g57kxLKvsAWXAADS2aJdct+t7vbwl7X0uscemtdb vdC94pKe27H/wK2DkU835tIdfn+GazWo1ISawJ7z3KbvmOba/2MWfuNvaAebwEU7Ccv5 vQcBOG4WaaJkhTds1EQtTww+M52HyxbPkK1EOvUs3jet45RSUsMZaVl9vSIk8tyI9949 1wBCleXlvY/MOBtj7XcOzMSKlYoD5rAjpJYwAdsx6se/suMlALCDXXADiJx243CFVJyI axGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.37; Fri, 05 May 2017 12:48:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752379AbdEETsg (ORCPT + 6 others); Fri, 5 May 2017 15:48:36 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:55224 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755479AbdEETsa (ORCPT ); Fri, 5 May 2017 15:48:30 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LmzQD-1dh9Ma48J3-00hO7s; Fri, 05 May 2017 21:48:26 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 53/87] net: vxge: avoid unused function warnings Date: Fri, 5 May 2017 21:47:11 +0200 Message-Id: <20170505194745.3627137-54-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:YQDBYtf/GLk0SdViCYLWVcgHapOt7hxE6wZtro0SPC0qfryhJ9s yEiPW9IIj6OI9NLtFRS3vYtChL8Vrk+nwCp+3S5PED9XQV5JkRzFvC//lTI98muDJhbdeMq QiFOeVp3QAV1PHo263RTPMMEqfM586myLvcZK+G3V4a5Dp2Y73pz86j8Z8ywndCO7sMrj4n xahKXc4MULaZSTpyKE6gA== X-UI-Out-Filterresults: notjunk:1; V01:K0:qHN/9FSXL5w=:rggTeyTEL7+2JG16O28koJ ZUmC+C2PoCL0cUnxv4RaMFXaCHkaZ1COybLefLnxhkc+47aWGDQsrn2O6y+NS/5BJVJ5e9iYS EGXfs2JClPXpqcfSyAAq7y0nwodJFthKCq+iptz0X0Kj9330AeWMvzOy0f2WEkLtgl14zwDAi QHPf2szQjr6vSlB9xaH9X1sT1NFbemWHEgkSX+z316wtYNQEV1rx4vS14BSmhiHaGl2ef+oZy 1fGehkYHV9AcfCSH+ZR6myc8JlWvavj0gsdh8dz6PRKfD0GT94f6OsUsA7i3EwM52L3mTyn0D VanROUkVB7fpoTHIMB2ugu1eu9NgbnpCvkokoykViIflbPViDc9FiDl8k0Y1pMna3vUtHcnu8 EUWGXbWx0DE1W0CtYNjYCQGqZyN3yovx8cELnOnODuR7p3lV4Ff4R1WXc7Nw3ZFeGFHA9+njJ PvmCkegxMUvfJC8+faFwoh3yMIQye7XkobxG2BepGhnYcWvHkWJGaJQJ5Pi60fjImP5M6iISk dIfFn1eywZvDpPe92hKrqYaMZDGWCb+Iehw9RH6T9J9jopG63g6HGa2Pm4uCVUKLYhgAk1hQ8 HuLu1Q0GU3ydDa0mqPzE5geAe3TDbnC0sr9m3sz+pIiKqghbSB1D3frqHjp4CQ0TV1Pu6B6Yc KAhj4gJLPbtk83of5r6vr6I8wj3DvNJMperhCNdvnMRuc/mT0pSJMLA3OHe/REVj6G+U= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 77e1adc8f41be3e2d44ca335814e8a78920f319a upstream. When CONFIG_PCI_MSI is disabled, we get warnings about unused functions in the vxge driver: drivers/net/ethernet/neterion/vxge/vxge-main.c:2121:13: warning: 'adaptive_coalesce_tx_interrupts' defined but not used [-Wunused-function] drivers/net/ethernet/neterion/vxge/vxge-main.c:2149:13: warning: 'adaptive_coalesce_rx_interrupts' defined but not used [-Wunused-function] We could add another #ifdef here, but it's nicer to avoid those warnings for good by converting the existing #ifdef to if(IS_ENABLED()), which has the same effect but provides better compile-time coverage in general, and lets the compiler understand better when the function is intentionally unused. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/neterion/vxge/vxge-main.c | 31 ++++++++++---------------- 1 file changed, 12 insertions(+), 19 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index 7a0deadd53bf..75682df75c89 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c @@ -2224,8 +2224,6 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id) return IRQ_NONE; } -#ifdef CONFIG_PCI_MSI - static irqreturn_t vxge_tx_msix_handle(int irq, void *dev_id) { struct vxge_fifo *fifo = (struct vxge_fifo *)dev_id; @@ -2443,16 +2441,13 @@ static void vxge_rem_msix_isr(struct vxgedev *vdev) if (vdev->config.intr_type == MSI_X) pci_disable_msix(vdev->pdev); } -#endif static void vxge_rem_isr(struct vxgedev *vdev) { -#ifdef CONFIG_PCI_MSI - if (vdev->config.intr_type == MSI_X) { + if (IS_ENABLED(CONFIG_PCI_MSI) && + vdev->config.intr_type == MSI_X) { vxge_rem_msix_isr(vdev); - } else -#endif - if (vdev->config.intr_type == INTA) { + } else if (vdev->config.intr_type == INTA) { synchronize_irq(vdev->pdev->irq); free_irq(vdev->pdev->irq, vdev); } @@ -2461,11 +2456,10 @@ static void vxge_rem_isr(struct vxgedev *vdev) static int vxge_add_isr(struct vxgedev *vdev) { int ret = 0; -#ifdef CONFIG_PCI_MSI int vp_idx = 0, intr_idx = 0, intr_cnt = 0, msix_idx = 0, irq_req = 0; int pci_fun = PCI_FUNC(vdev->pdev->devfn); - if (vdev->config.intr_type == MSI_X) + if (IS_ENABLED(CONFIG_PCI_MSI) && vdev->config.intr_type == MSI_X) ret = vxge_enable_msix(vdev); if (ret) { @@ -2476,7 +2470,7 @@ static int vxge_add_isr(struct vxgedev *vdev) vdev->config.intr_type = INTA; } - if (vdev->config.intr_type == MSI_X) { + if (IS_ENABLED(CONFIG_PCI_MSI) && vdev->config.intr_type == MSI_X) { for (intr_idx = 0; intr_idx < (vdev->no_of_vpath * VXGE_HW_VPATH_MSIX_ACTIVE); intr_idx++) { @@ -2577,9 +2571,8 @@ static int vxge_add_isr(struct vxgedev *vdev) vdev->vxge_entries[intr_cnt].in_use = 1; vdev->vxge_entries[intr_cnt].arg = &vdev->vpaths[0]; } -INTA_MODE: -#endif +INTA_MODE: if (vdev->config.intr_type == INTA) { snprintf(vdev->desc[0], VXGE_INTR_STRLEN, "%s:vxge:INTA", vdev->ndev->name); @@ -3890,12 +3883,12 @@ static void vxge_device_config_init(struct vxge_hw_device_config *device_config, if (max_mac_vpath > VXGE_MAX_MAC_ADDR_COUNT) max_mac_vpath = VXGE_MAX_MAC_ADDR_COUNT; -#ifndef CONFIG_PCI_MSI - vxge_debug_init(VXGE_ERR, - "%s: This Kernel does not support " - "MSI-X. Defaulting to INTA", VXGE_DRIVER_NAME); - *intr_type = INTA; -#endif + if (!IS_ENABLED(CONFIG_PCI_MSI)) { + vxge_debug_init(VXGE_ERR, + "%s: This Kernel does not support " + "MSI-X. Defaulting to INTA", VXGE_DRIVER_NAME); + *intr_type = INTA; + } /* Configure whether MSI-X or IRQL. */ switch (*intr_type) { From patchwork Fri May 5 19:47:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98715 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293225qge; Fri, 5 May 2017 12:49:39 -0700 (PDT) X-Received: by 10.98.148.2 with SMTP id m2mr19197355pfe.28.1494013779802; Fri, 05 May 2017 12:49:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y32si6309907plh.238.2017.05.05.12.49.39; Fri, 05 May 2017 12:49:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755968AbdEETti (ORCPT + 6 others); Fri, 5 May 2017 15:49:38 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:52664 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755479AbdEETs5 (ORCPT ); Fri, 5 May 2017 15:48:57 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXi7y-1dav1h1DPy-00WU2d; Fri, 05 May 2017 21:48:27 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Varka Bhadram , "David S . Miller" , Arnd Bergmann Subject: [PATCH 3.16-stable 54/87] ethernet: amd: fix pci device ids Date: Fri, 5 May 2017 21:47:12 +0200 Message-Id: <20170505194745.3627137-55-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:3d4fQn0NTqDGG9Lo9YxdMKLcUNVvWUD24AEnfEfQrIBvNPlbbzO H2MFMYNlwDXdReEZBGCi1Y+hwCF+oAXs3NZU2c8bgu6/VObWCyxLp44WKg1cZsGQEXjvtUR 628trH+VPwSjKjU8gStVmoPQVb9dM+690KCnO1/2pse6//LOLCXCIuJ5mUkABgGs3CLt0ii vSfvfSiwFuYldg9uMipgg== X-UI-Out-Filterresults: notjunk:1; V01:K0:N/n89qGAnw0=:CEx7UhQ8Y4/utJlr1ovZfj ADgKlQY110JmwX2dYLGwOw8XDCD2QpbEFDBeJJmwC9KmVlNzJynh8XtSjDYQyKAEqKYX31+Rs 3jI3e6ta6Lu7K/QjdEwHQ8Vk9EHwSnkW+qAMrSwlQ7oddUBlXxFD77bLnU7KyBvSqAbGZ1zbn coDB9vh+Lu6ZdYJzyH9eO59iHDHwZL0eovoANoZVthH+L83gH86+T14nOCR0NwptvqnZfevN8 GfpUW0PAk8O+/S3rMkQXoNxccQAc7ogEYGIypZPFqeoUK2AHEjaUl8HaEeXPCT9JgRnOJd/Wu Sje+X7C5w6HPSPJWFIPW7QgrRg3QOjPMrDJHpHi238tsPB0ey8ru7sHUZ1F37RMHLJIi+AmEc pFPTM/bXeNCIcJ7K8udxBfJ9pXMnJ8fJ/lncLWYqz7wp2veLqakvMrlmyH9prJEH4oY7wpSoa ns+CAJ+Txfu9yC7k1KKzL1GTxTbx7X4LhXizv0k4VyFIpzN5EajLTQS7x9C6EkeRjydAeiVHu 5X70B5QlSZsIMksndqVQyben8tklbB7P7g+TYYGHRE7KXvcpNRCEcxdhMHUgtbWxrCcvAZ/iN rjssQzPYdYJlZ7Rdza4fdfvRsat60dYsyl2iqC9FT9Lgj7F27dCPy8SxNECaTuV1MJYrayRhP TaZ6f3dLAzY+Kl58rKX0C6SXTpZBCUIhKRkkfN3O2lFVxbar5nsMzuvCo4od10+rvmvM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Varka Bhadram Commit ba69a3d78e4f51e65933a86b8b107c86709bb2f5 upstream. Normally any device ids will be above the corresponding device driver structure. This patch moves the pci device ids and MODULE_DEVICE_TABLE() above the pci driver structure. Signed-off-by: Varka Bhadram Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/amd/amd8111e.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index 068dc7cad5fa..47b34f7c4512 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c @@ -101,7 +101,6 @@ Revision History: MODULE_AUTHOR("Advanced Micro Devices, Inc."); MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version "MODULE_VERS); MODULE_LICENSE("GPL"); -MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl); module_param_array(speed_duplex, int, NULL, 0); MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotiate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex"); module_param_array(coalesce, bool, NULL, 0); @@ -109,13 +108,6 @@ MODULE_PARM_DESC(coalesce, "Enable or Disable interrupt coalescing, 1: Enable, 0 module_param_array(dynamic_ipg, bool, NULL, 0); MODULE_PARM_DESC(dynamic_ipg, "Enable or Disable dynamic IPG, 1: Enable, 0: Disable"); -static DEFINE_PCI_DEVICE_TABLE(amd8111e_pci_tbl) = { - - { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD8111E_7462, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, - { 0, } - -}; /* This function will read the PHY registers. */ @@ -1970,6 +1962,17 @@ err_disable_pdev: } +static const struct pci_device_id amd8111e_pci_tbl[] = { + { + .vendor = PCI_VENDOR_ID_AMD, + .device = PCI_DEVICE_ID_AMD8111E_7462, + }, + { + .vendor = 0, + } +}; +MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl); + static struct pci_driver amd8111e_driver = { .name = MODULE_NAME, .id_table = amd8111e_pci_tbl, From patchwork Fri May 5 19:47:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98721 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293336qge; Fri, 5 May 2017 12:49:57 -0700 (PDT) X-Received: by 10.98.46.69 with SMTP id u66mr18929694pfu.262.1494013797821; Fri, 05 May 2017 12:49:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si2689373pgp.198.2017.05.05.12.49.57; Fri, 05 May 2017 12:49:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755624AbdEETs4 (ORCPT + 6 others); Fri, 5 May 2017 15:48:56 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56178 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755754AbdEETsl (ORCPT ); Fri, 5 May 2017 15:48:41 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M3JVg-1dxJrn2LpY-00qxI5; Fri, 05 May 2017 21:48:27 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, David Malcolm , "David S . Miller" , Arnd Bergmann Subject: [PATCH 3.16-stable 55/87] drivers/net/ethernet/dec/tulip/uli526x.c: fix misleading indentation in uli526x_timer Date: Fri, 5 May 2017 21:47:13 +0200 Message-Id: <20170505194745.3627137-56-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:wzy8kxg1KjUJx7MqAzDDfa+XsM8wZzKkF1UGf1ESGcfMrNBgMLG TjZhlgZUcFrJIDCylOewAtSQywCOwrIuQlRwEfGRStQkzCrqWIL2bCLF556GrQq8qCM+zFj D2hqn7dpNRIMAYtP/ms1+whrI8HjxeH2SKw6JF5v36/J7E0Ys58upIdkEc3UqQKoxfBOVfv rCe/MUCtvZKJNnxWcrffA== X-UI-Out-Filterresults: notjunk:1; V01:K0:WwR4CFTgPxk=:lYyXnJ+KaDKkkwmHcmxh8S 0bohuqHzPcHjXq4fisxZQ5CeiPfqQDqAOv06NlVxAWPTMfM2ZQ89cnowLmnR80YkcqNaCDSbH OkoTbE2v9bQhWH6sJxyatthup4R57PDKEhkBU7nxWACyz/WyI0wCOK8V/ve5N108CrLCw2afj 1/mJxF1Ib7eJFs/4+yeg0xAgBPlo7sU8dSgfOQc1sunzEu2YcT1jjV5Er5+MJ8NGhLREfGYCf qUOK8ZExxzJ7UMILEdgQe/Fo4tds61MJZr+sCk7D3D33uFvv7S4WBalHofCbJQWb4E2C8Pq2D W2UptOBDbmO/huVkUC3gA7OAb2EXqTrM96kfVHfckx6I8L0tOsnb5MOvYUEk3NLL28KvjW6Hf 0GDWi/9P91Xojm6N5YYH+MgPpGwPQUqdxVowWY8LQrZiCTkJcvjpNjhln0F7CUDv4G7ZXHrNr q1LChxgHOLNRUhOEx4qoHYwaWXnAOUV68pwUZEFcGR/6NhsZdYnMBWxJeazD1pu6HFLd08R0F 1M5oTjXd2xM8FKMjyXCVjwEKduk0lqyXvEI47RVXQnravP6cZJaWwFaaN0vdZcJJgdbVmQBCk JZzdoAdH1+CSpPha7ozoZV/VJt3/IytKO+nGMHeF7SAi9MdpXDLsVrDOz9Kx87E1AfHID7G4G KlvaxhBGg+sAeACIRbre25MQrUSHuuvm2EY8xVv2+B1Q2bPH3S/CYzU6J+unYQcOAWt+WOJrU cEkMtoYUPTtdMjJj Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: David Malcolm Commit 862f90c368e4e310def16f5a89edd0e078d7b840 upstream. This code in drivers/net/ethernet/dec/tulip/uli526x.c function "uli526x_timer": 1086 } else 1087 if ((tmp_cr12 & 0x3) && db->link_failed) { [...snip...] 1109 } 1110 else if(!(tmp_cr12 & 0x3) && db->link_failed) 1111 { [...snip...] 1117 } 1118 db->init=0; is misleadingly indented: the db->init=0 is indented as if part of the else clause at line 1086, but it is independent of it (no braces before the "if" at line 1087). This patch fixes the indentation to reflect the actual meaning of the code, though is it actually meant to be part of the "else" clause? (I'm a compiler developer, not a kernel person). It also adds spaces around the assignment, to placate checkpatch.pl. Seen via an experimental new gcc warning I'm working on for gcc 6, -Wmisleading-indentation, using gcc r223098 adding -Werror=misleading-indentation to KBUILD_CFLAGS in Makefile. The experimental GCC emits this warning (as an error), rightly IMHO: drivers/net/ethernet/dec/tulip/uli526x.c: In function ‘uli526x_timer’: drivers/net/ethernet/dec/tulip/uli526x.c:1118:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] db->init=0; ^ drivers/net/ethernet/dec/tulip/uli526x.c:1086:4: note: ...this ‘else’ clause, but it is not } else ^ Hope this is helpful Dave Signed-off-by: David Malcolm Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/dec/tulip/uli526x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index 80afec335a11..f6b8edf6516e 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c @@ -1115,7 +1115,7 @@ static void uli526x_timer(unsigned long data) netif_carrier_off(dev); } } - db->init=0; + db->init = 0; /* Timer active again */ db->timer.expires = ULI526X_TIMER_WUT; From patchwork Fri May 5 19:47:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98704 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292931qge; Fri, 5 May 2017 12:48:54 -0700 (PDT) X-Received: by 10.84.128.47 with SMTP id 44mr66811741pla.35.1494013734478; Fri, 05 May 2017 12:48:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.54; Fri, 05 May 2017 12:48:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755870AbdEETsw (ORCPT + 6 others); Fri, 5 May 2017 15:48:52 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:55746 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755707AbdEETsi (ORCPT ); Fri, 5 May 2017 15:48:38 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MTbOB-1dWoHr00cp-00SNR4; Fri, 05 May 2017 21:48:28 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Kalle Valo Subject: [PATCH 3.16-stable 56/87] hostap: avoid uninitialized variable use in hfa384x_get_rid Date: Fri, 5 May 2017 21:47:14 +0200 Message-Id: <20170505194745.3627137-57-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:wQgkpkWTFRatR/RStdwEN/8UySQelDpcJ/03jLaDGnHauzdlkdN 5TUevJpLHHUVWnsXVHyTKEdmZbVgGpBp9e/ObJGfYukoEIMkQmFIEBP/Ngthw3rt7XbqAu+ eWHyGQP/v0xtp6RQK/SBQIG21HNEfygACinv8Aj16RrdmYtdfDQOut82OFEQCeDOStEA55b z9wjGClyysL/bNrnLC1Kw== X-UI-Out-Filterresults: notjunk:1; V01:K0:qSOLsVNywcM=:8BMgZhnfoVXAEhbXv0tui/ s+C5czrzfOXchgdXZHPalFCWJqsKxX3CRRZAxyb5lIWA8pt5bXVM866QfvtKUzrANhs53MSNC IUCy8Fd1vT0NkKqDdMmRq0BAllY35ViZNF9tSxvO9Lcc1J5u+UFtoEj/kStEXL4QFzcyj8jil PfmQfSJmznswimWalaJCGBChpIQ0nhZWSoRZYD2LBZ0F7abwxqX6BcZLB6JWDBj3ntnr2m8zI QTK6HWEN6oZe2cwVL9+cTfDLQ1zOIN1z0PxIBV/BoygY8NJchdO94woz63oOp15DGHIQlEkM+ yA5tHPIoU5/5vcR2FR6UqkPqTCeU1ySBLquHxNbljAmf+OISluX6yzfDe7iDm2I1qiz94sHgp nr56VEsVRFKryEFXRT12C9Vxf4WXc6No9ukwP3sPUY90cl9pqjAsI/FCvteXHlG9KnvdV8782 a0IM9fWAJzmibNBEMv5W+HxZXTHr4mD0kYVvfyOcEpPnXPDiz4kthRLzW4MNCd2FIEQkg5X2P o+Jv4gnB+V5QZziY5r6o8VebBcLBXgp+e6cZiAQZoUOrozxjG2ZLxcVq2eqYxNtvssC6K2vc0 QpzDtx6kZrB2NvJ6CdgM1u5fKIKC/Y9JdmqkF+sq53ZHPtSaWN79rWFdMgLb2rQzN3wi4WhFX 2PvhUrUqSWbusohLz8PUgZz/Qy6Bmt3hepcOe5J5FE0LhG59pvlMP2XRYRGzu5LPXMaI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 4dc690c46508d23c143a9e8f12ebde6e11e901d6 upstream. The driver reads a value from hfa384x_from_bap(), which may fail, and then assigns the value to a local variable. gcc detects that in in the failure case, the 'rlen' variable now contains uninitialized data: In file included from ../drivers/net/wireless/intersil/hostap/hostap_pci.c:220:0: drivers/net/wireless/intersil/hostap/hostap_hw.c: In function 'hfa384x_get_rid': drivers/net/wireless/intersil/hostap/hostap_hw.c:842:5: warning: 'rec' may be used uninitialized in this function [-Wmaybe-uninitialized] if (le16_to_cpu(rec.len) == 0) { This restructures the function as suggested by Russell King, to make it more readable and get more reliable error handling, by handling each failure mode using a goto. Signed-off-by: Arnd Bergmann Signed-off-by: Kalle Valo Signed-off-by: Arnd Bergmann --- drivers/net/wireless/hostap/hostap_hw.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -- 2.9.0 diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index 6df3ee561d52..515aa3f993f3 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -836,25 +836,30 @@ static int hfa384x_get_rid(struct net_device *dev, u16 rid, void *buf, int len, spin_lock_bh(&local->baplock); res = hfa384x_setup_bap(dev, BAP0, rid, 0); - if (!res) - res = hfa384x_from_bap(dev, BAP0, &rec, sizeof(rec)); + if (res) + goto unlock; + + res = hfa384x_from_bap(dev, BAP0, &rec, sizeof(rec)); + if (res) + goto unlock; if (le16_to_cpu(rec.len) == 0) { /* RID not available */ res = -ENODATA; + goto unlock; } rlen = (le16_to_cpu(rec.len) - 1) * 2; - if (!res && exact_len && rlen != len) { + if (exact_len && rlen != len) { printk(KERN_DEBUG "%s: hfa384x_get_rid - RID len mismatch: " "rid=0x%04x, len=%d (expected %d)\n", dev->name, rid, rlen, len); res = -ENODATA; } - if (!res) - res = hfa384x_from_bap(dev, BAP0, buf, len); + res = hfa384x_from_bap(dev, BAP0, buf, len); +unlock: spin_unlock_bh(&local->baplock); mutex_unlock(&local->rid_bap_mtx); From patchwork Fri May 5 19:47:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98696 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292862qge; Fri, 5 May 2017 12:48:45 -0700 (PDT) X-Received: by 10.98.12.72 with SMTP id u69mr18729458pfi.47.1494013725547; Fri, 05 May 2017 12:48:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013725; cv=none; d=google.com; s=arc-20160816; b=XmocUHfnUr3ZwoXK+iq+f4AVQsZjKjz3LNzcgsTip/m+CXy+QGOg6LEG2hriHBgnxQ p4B1GfLvf44o9vpTlN8nzlcmXXRd8u9OqKoegZNUQQ0cTYYMckUTl+a/VlFSTKrfNJ0f SffJsbs4t7XLK2DmPw5VniPSvJzSQ417CFsCI7l7TM0Fk/vshNo4705EVlLy7FcWWdB/ 8ph/6eeJUZhXAJkgIkkzf3un3IxF1pLsSnVrJCcdFveDVCSkXlAQQ6FcRpJFI9fPWxwt AyqGKVjrX/jKz+M8er0iTG29Rg6o2HEXCWxXDJ1YMyrZc0bszyGF24657OYKOJaHdi7b 7/sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=wdTv5/2q7k7DN5cJE+L2rg1HVJN2Fjf2xOIfoGooAOs=; b=IFgBnZLKQbA2qGfa9KzCsxb1Jgytny8100CkLEmypXJLoi21qsOCZXL03y8NQSnd60 kGfHEJGIhUmq4y97upGjmJwhGwndMDCAVqvGWz93CBhWjcevd3/Ng4NFtcWbhhFAAIY7 AEAzAJOhWQNYQD1PpqeO1P8sPRZ9YcMc9BufuOQBeBFk/qI69ZRR19ZlmRYKG5mk4Zrj bHQ5AS6XjGov2LFfdSQLX+bkKfUuZEHT7ueXalwGi6oNi5W+7eIMLDj0SOQDptf1ixc+ FGnSjhGW4at0Thq5j9BAeQ4OuI+DObAJ1iKR5mkEfzfjWZx14mQ3fEZ7Uyn281lTKtQ5 pBLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.45; Fri, 05 May 2017 12:48:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755587AbdEETsk (ORCPT + 6 others); Fri, 5 May 2017 15:48:40 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:62995 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755597AbdEETsd (ORCPT ); Fri, 5 May 2017 15:48:33 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MSUvb-1dVitD11EB-00TUQg; Fri, 05 May 2017 21:48:28 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Kalle Valo , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 57/87] iwlegacy: avoid warning about missing braces Date: Fri, 5 May 2017 21:47:15 +0200 Message-Id: <20170505194745.3627137-58-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:qHwg6kzIZC/Gxm2Ixt51DtIZdIh6UQXkB/9RvMJeXyUCmAp/vv+ Jcdnr7laR4QZ8C/8jC9KjhiaPUiljqL/VA1IOX4WVeemhDO/tsZcyI2ctydd1WUwTIWFdQY iEVAitV0eYnq9f66xOBf+t2UxfGodjvFu6lGCFchizUenHaVH30FFVhD+U+ecN202GlAbpi OBa52kAQrp8uNI/Eco9pA== X-UI-Out-Filterresults: notjunk:1; V01:K0:J2cCFDyITBY=:KF7ccnFS7uz06mR6CNHTgs rl9PayuoVCbZlZ2tmJdkKGDuUMM4HOQ+DkJP/wEFv4vBPM+MGx8oX+LpWB5dpBoND9EX9eVg6 wjH1hkpswiPMP7iwokCGK5WIHxaqIG6CC+cY0jDwvc092K8L4r0meDHfZMOiWWy9n7ab23Wcw izEPgFvBrYS3BpMAeDi7rhoSV909FVLdaZ2R8E2B45unNcS1pOyFJP8HIqB8X7fTcqCBK2F0u gA+zTDoW4h8PP1hBz2hpZIwUie7/Jm3uGpIJkQ55pIbE4W6jL32BI66D/poqn5XvzX9qPGr6z DBpqj7a/OXsb6u3aC76ysSU9NURwr7mu/YDMYpvJv1KWi8+vpQBmzg0zVSn4Q9AFbpJ67p3Mz lmzXtqpBo2KhRR4VRNLsRjgFe4uBVvFZmlpOLdU//zFjMBqAljzHq64ODfuX0ZqhZ2U3xlvXH ADKfsDgateqElvMGc/qge5sdG13TsQwUmbDyUwejZHEzJ0E9KPPlPGdgbAIcq1QXoOkBiyug3 moxQPsC3mew/oVk/AnJefONVmhZ7ql3+dAs2nWBEEgMjUXRHA8WU5e1qJmRNa7Iiu1bZZ/EvT ljorAp6Kmx1v2CxsIyu9KU4k4u71GxzW8auoBhFVopKolKNJVesjIjQ86sdyQkGs6CK6uVm4A YctnSlYlkN6OwX0PtMjVRqbcsnktroUf5YS19/f1QyKCq3tV1iracjzGB8U91iRWIZ7E= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 2cce76c3fab410520610a7d2f52faebc3cfcf843 upstream. gcc-6 warns about code in il3945_hw_txq_ctx_free() being somewhat ambiguous: drivers/net/wireless/intel/iwlegacy/3945.c:1022:5: warning: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] This adds a set of curly braces to avoid the warning. Signed-off-by: Arnd Bergmann Acked-by: Stanislaw Gruszka Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/net/wireless/iwlegacy/3945.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c index b598e2803500..fbfd77440049 100644 --- a/drivers/net/wireless/iwlegacy/3945.c +++ b/drivers/net/wireless/iwlegacy/3945.c @@ -1019,12 +1019,13 @@ il3945_hw_txq_ctx_free(struct il_priv *il) int txq_id; /* Tx queues */ - if (il->txq) + if (il->txq) { for (txq_id = 0; txq_id < il->hw_params.max_txq_num; txq_id++) if (txq_id == IL39_CMD_QUEUE_NUM) il_cmd_queue_free(il); else il_tx_queue_free(il, txq_id); + } /* free tx queue structure */ il_free_txq_mem(il); From patchwork Fri May 5 19:47:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98710 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293002qge; Fri, 5 May 2017 12:49:03 -0700 (PDT) X-Received: by 10.98.214.90 with SMTP id r87mr7810260pfg.204.1494013743406; Fri, 05 May 2017 12:49:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.49.03; Fri, 05 May 2017 12:49:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755960AbdEETs6 (ORCPT + 6 others); Fri, 5 May 2017 15:48:58 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:54732 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755338AbdEETsn (ORCPT ); Fri, 5 May 2017 15:48:43 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lq1p2-1dkAhg29IW-00doA1; Fri, 05 May 2017 21:48:28 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Kalle Valo Subject: [PATCH 3.16-stable 58/87] brcmfmac: avoid gcc-5.1 warning Date: Fri, 5 May 2017 21:47:16 +0200 Message-Id: <20170505194745.3627137-59-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:ptz5ryBb02mp5b7lciuq1ENHmXcZffMfVRt9+VQr7N2lPva6rCQ K7YOa/EMrHBA2ctetZD+W+wzDPPxqyB5NnCyaXFjWvXeWHNQQdDYe6px+gtyIDVuwzCffwF KsQzza/scwBuEfrgVkbqgClitc9NWeP8kap2cIwWDRvOfl847RO07KUxOBnDcwQ5TduDiQ4 xH51ge89SkNAq7iIdfxlQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Xr72FbDJXso=:KXy54xvdPl7/OoXwHvQ79H ze4NMZA5mYn3lLSPtiixBSPkawT+7kmFbMuvWcLw6mnJBfS6dwIA10iIYTcX/L0fi2TdLs8hE 6NGMi93J91T1sU4Ued5AKOK+kUzED5GEjX1tiZR0Sogy5FfUuV+6oj0yggM54XqT4LHRxBkw7 IyQP2TQAjmVRkBwdMiapv7R7n0SZZPPkwz1Pt19hHWQqQmkvwkNKfA1FHa2I3qteDMglmuJK+ vlG99ZjmZfE0XkVXH3+fC9Ir2ukNNmMwLGTe4/QWGqAort8kiHaaTp2heJ74PYMXZ6KnRkYBV 4nphwP04QnA3+IaNGUDuFNnyOIUf44c0ppgp3/o55/X/O+FwMEUcFvi4IZX499Mam40cX7h5I GdTg0lPyZGrjF9G2AFFOgVOLCZWfXAkTipv0iTW1DrzBvCRLnDsutp6L5wDRfrKZZacE1xL13 Y5zpIwK4CpkDp8fedwrXml44P1wjAz4+/Tdld5ZsIKoMqGqePCRBmEf2t3orceNCCsNOrYYfs iXHEn4QHiDcUtrNc1G1G7jMdZ98dKkE/yVd4w3CneIUqWAUQBy1R89rX5WCmyEWcTkICkTDqD 7V7CscvF4iP+fRiXOwH2P2cD4fFVTJsYuwUqwYwAx7gzwLf4SQ14bj89VR+icBrkLatnGho8x RKsjeGvHXOlK6TdmONVQ6soRpNugxti8x9CYYemtcjHblxeIpd0Alq7llLXEN0u63jqI= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 85773e14ccccddaa9ee4b5bc08b3cf9d62d2c1a8 upstream. gcc-5.0 gained a new warning in the fwsignal portion of the brcmfmac driver: drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c: In function 'brcmf_fws_txs_process': drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c:1478:8: warning: 'skb' may be used uninitialized in this function [-Wmaybe-uninitialized] This is a false positive, and marking the brcmf_fws_hanger_poppkt function as 'static inline' makes the warning go away. I have checked the object file output and while a little code gets moved around, the size of the binary remains identical. Signed-off-by: Arnd Bergmann Signed-off-by: Kalle Valo Signed-off-by: Arnd Bergmann --- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c index 699908de314a..c9b0586d7b58 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c @@ -607,7 +607,7 @@ static int brcmf_fws_hanger_pushpkt(struct brcmf_fws_hanger *h, return 0; } -static int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h, +static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h, u32 slot_id, struct sk_buff **pktout, bool remove_item) { From patchwork Fri May 5 19:47:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98713 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293072qge; Fri, 5 May 2017 12:49:15 -0700 (PDT) X-Received: by 10.98.252.129 with SMTP id e123mr17271592pfh.135.1494013755278; Fri, 05 May 2017 12:49:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v1si2687620pge.374.2017.05.05.12.49.15; Fri, 05 May 2017 12:49:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755957AbdEETs6 (ORCPT + 6 others); Fri, 5 May 2017 15:48:58 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:52516 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755646AbdEETsn (ORCPT ); Fri, 5 May 2017 15:48:43 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M6rkj-1e0s6j393F-00wi3U; Fri, 05 May 2017 21:48:28 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, David Miller , Arnd Bergmann Subject: [PATCH 3.16-stable 59/87] netfilter: Fix switch statement warnings with recent gcc. Date: Fri, 5 May 2017 21:47:17 +0200 Message-Id: <20170505194745.3627137-60-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:UAbIAUlc/mXRtxJTPJIaNBclpnPFeva6fQOhNdKkzvAokXdahEi sPei5kGyWTwJgFlRRFmLBPqupHpN/Pk05XRiVa8xN2D7YFQRdwC7mGNlG5kCF5+0fwJEdnd gki0saFqwhepjht+ORiWUYEOLlnG0c+nrohMk2IXV8UFqTxBqxHJ3JDItq1JbheZTv5GHiz xkz4w8WEuxA6YHZ7bkQ5A== X-UI-Out-Filterresults: notjunk:1; V01:K0:RznpU3GvVus=:RV1ZsG1h0YR5Lw+JdDROor 8wn3YdeVGJLf5MGm9oLW2XCgs58dOeisct//tsNcIMDFWasN2rhBJQrxuqY+69a0o/hMDvlH4 8DamgTfqy+KIjvKPhCatXIV7ENBm5OGl5soZT7m39NQGlecqmCSaNHDvwkNQxJsPBFB/iAB8w 8UGbcG38jHFiySrbUrvwSMqSGGoM+PrD8JNmCwHAC4doldcYwlu8O41U/jMVmyKVv0+oselb0 5bMPi9iAblsrVjsNldrnYkbU9CTyRetp1YGQrXl2sqjK4F4t5oSyju2ctFF7VQV3JVg2eZ14q PDcXt5PCu9hT+iTHuKype1cPPHDnfYVNlbUgHqJHpxGyVw8bFB/ChDJVDoCDRELfgrN/OXNt/ fzATJ+uZ0SoTL2hrDbOPJE+VwTcb0Uc6CYpahfYs9whIa4Q1jfmM3ksxPHLr97IiJOTiRbdPF w4CbJj2CZIkiXVz2OQ60IeJFv7CbkVhTxyEkJhfFDjpugG5B818/G2PazKrm+K8+3zqJ8gq8Q i8JKQ472S65X4OA6UaznZv6+V3iOvqvsbQOfIFUwumVZaeJ3kTIbYi723x6lEHzMtJUtRdUR1 xy2ZyVXs8SqmPvUsAtq/Ue5WFNzuXXSqpyFVYFTEbhzbWKX3z73A66WioOOfLXmtZuYu7VYF0 6UaBW6nHtYc6k0HhZFm8bC2fYpp26juTM4klTkN/K0WTt92lYZnB0EkxaMOlVDWou0aY= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: David Miller Commit c1f866767777d1c6abae0ec57effffcb72017c00 upstream. More recent GCC warns about two kinds of switch statement uses: 1) Switching on an enumeration, but not having an explicit case statement for all members of the enumeration. To show the compiler this is intentional, we simply add a default case with nothing more than a break statement. 2) Switching on a boolean value. I think this warning is dumb but nevertheless you get it wholesale with -Wswitch. This patch cures all such warnings in netfilter. Signed-off-by: David S. Miller Acked-by: Pablo Neira Ayuso Signed-off-by: Arnd Bergmann --- net/ipv4/netfilter/nft_reject_ipv4.c | 2 ++ net/ipv6/netfilter/nft_reject_ipv6.c | 2 ++ net/netfilter/nft_compat.c | 6 +++--- net/netfilter/nft_ct.c | 8 ++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/net/ipv4/netfilter/nft_reject_ipv4.c b/net/ipv4/netfilter/nft_reject_ipv4.c index e79718a382f2..292783018da5 100644 --- a/net/ipv4/netfilter/nft_reject_ipv4.c +++ b/net/ipv4/netfilter/nft_reject_ipv4.c @@ -33,6 +33,8 @@ void nft_reject_ipv4_eval(const struct nft_expr *expr, case NFT_REJECT_TCP_RST: nf_send_reset(pkt->skb, pkt->ops->hooknum); break; + default: + break; } data[NFT_REG_VERDICT].verdict = NF_DROP; diff --git a/net/ipv6/netfilter/nft_reject_ipv6.c b/net/ipv6/netfilter/nft_reject_ipv6.c index 0bc19fa87821..367bd4841a0c 100644 --- a/net/ipv6/netfilter/nft_reject_ipv6.c +++ b/net/ipv6/netfilter/nft_reject_ipv6.c @@ -34,6 +34,8 @@ void nft_reject_ipv6_eval(const struct nft_expr *expr, case NFT_REJECT_TCP_RST: nf_send_reset6(net, pkt->skb, pkt->ops->hooknum); break; + default: + break; } data[NFT_REG_VERDICT].verdict = NF_DROP; diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c index 62097fda49dc..55be1e0a4a7f 100644 --- a/net/netfilter/nft_compat.c +++ b/net/netfilter/nft_compat.c @@ -295,11 +295,11 @@ static void nft_match_eval(const struct nft_expr *expr, return; } - switch(ret) { - case true: + switch (ret ? 1 : 0) { + case 1: data[NFT_REG_VERDICT].verdict = NFT_CONTINUE; break; - case false: + case 0: data[NFT_REG_VERDICT].verdict = NFT_BREAK; break; } diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index cc5603016242..18d520e0ca0a 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -56,6 +56,8 @@ static void nft_ct_get_eval(const struct nft_expr *expr, state = NF_CT_STATE_BIT(ctinfo); dest->data[0] = state; return; + default: + break; } if (ct == NULL) @@ -117,6 +119,8 @@ static void nft_ct_get_eval(const struct nft_expr *expr, return; } #endif + default: + break; } tuple = &ct->tuplehash[priv->dir].tuple; @@ -141,6 +145,8 @@ static void nft_ct_get_eval(const struct nft_expr *expr, case NFT_CT_PROTO_DST: dest->data[0] = (__force __u16)tuple->dst.u.all; return; + default: + break; } return; err: @@ -172,6 +178,8 @@ static void nft_ct_set_eval(const struct nft_expr *expr, } break; #endif + default: + break; } } From patchwork Fri May 5 19:47:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98697 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292866qge; Fri, 5 May 2017 12:48:45 -0700 (PDT) X-Received: by 10.99.62.67 with SMTP id l64mr5221694pga.172.1494013725834; Fri, 05 May 2017 12:48:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013725; cv=none; d=google.com; s=arc-20160816; b=SXBqDjnMRDYggwsznc5x+CZsy7zE88tdRfXyx/WqwZGy1TV+wCgbyxIAU5qSlyTVIQ xBPqQWeDFXPQf7kyFs+kpmKPXFGmxY8XhBemVrnsG0FUqsNH8whr32n4OprbWy7FWkji 6Xpj2D8mV/+aG9hJL50xBTuCR0WqyJN+Cl4zPp5XgwUR+8R81awAzYKIco06PTkQVyLH fonLxvbrWcmtpTwyr+RYVu71i3V/RO1T8JkJbZi8UI+g6yY7rscWULLcHBbFZ0Y5G0qO iLzlt+HG6o76MrMrkP6FqfyoubM9UWOuZo/s5aWLTRMMiN/DJgVppEvbQFxa+ZvBM0vX rCaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=w9ezIIELKrzvxk/Y+qo2zIltCmsrOdM/vfcMsQCM6co=; b=AZXP/rpRG59ZMLoAkdp+rRTkXVsL2QOHB//4N/8BbB/cggklb2UmYXfzao9azzIxns IWA+iTrBo/EyWqjXph6XiTinYEbo2+FRYDh7fJsyMbWDJfFewF23Bbzb4pqyWZ8PzMxk EqO7XLjZGaWH1TPkeGZqKsu7mc/OOkMBI/uu6n/EkSfqPqpkflNiorR5zbdoNXLb8+Nx /HbM7JzyFCCL6dvAUhvlUt0ey1TMk7Vnb74TkbQS3WHm/lUhJh8hDhSExk7y52U0BXfT +STYwRCy7AdNnzNDBG18/v9DamT+qMSjTr44cnmzYCdDUqR52dJnNErco0gI8RcJQD9q qQ/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.45; Fri, 05 May 2017 12:48:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755757AbdEETsk (ORCPT + 6 others); Fri, 5 May 2017 15:48:40 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:51354 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755521AbdEETsd (ORCPT ); Fri, 5 May 2017 15:48:33 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MEfH7-1dI1lF4BD7-00Fn4G; Fri, 05 May 2017 21:48:29 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, "David S. Miller" , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 60/87] netfilter; Add some missing default cases to switch statements in nft_reject. Date: Fri, 5 May 2017 21:47:18 +0200 Message-Id: <20170505194745.3627137-61-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:VD9XnhDTUGDd3qDYA3qwG4xADbEH39wwqFtjbR3yrv+lENwS4Pf doUHzL2UBb/I5lJbl21SqwpG8rJK7BCmwRb0w/oqSELrpM77/hgjAX9HoRV2V704koS4kCw 7l4inBnnlumcGgH6YxdH6mWTacVY7sLQ1I2IBXQsvgtNEfZ5uME6mBM+mFqZUyYolMxLilR Z3i+qUr5v1mYq6bJ5uMoQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:lsCWZe/9i2w=:/f8a6fazCHRq9hunwCZDLp ukukIRkDbENWpD3u1Bzcb/usuo+b9nX1J1O5b9Urf6AnwnGDU3wIbRgpIoLXUJKcKUqsHD6Vp 97kbKmIOD00YlxwZjT6EEQlhKUei9i165M8GbYu0/PWhcdNwOKCBSNPzyst53WF8Y0KNIfAIM m3wVl2u7EEjyMsyMIWjXYrBKWyy/Y7jcZVWkGlV64CYufBp7G75NZ+PMD8kw9nqPEvSTPQFg9 EvBTXzHj8OLF/2UA5obIUGCaz3ufo7PJNfnfX3vqduZQuyYhzzxcHLJKAdxvdjiaPLiMWNCpQ n0nW9Ws3Ul91P6sZTAMQVedHzWwqWTOYKzvSMIJkGRyE8PntenHP7UuDCQmfzQxBi8/s0z/iS gxYJltSDiQzQi4vlXKksm+/tHjZFyy8JpTj3dTfDhTJ6+ySVFjRelsa2GXf2tmfVkqBXago77 8XYvYbzTWgclhGqX3VwI5VVSodcv0K58oN7pTIkdg5KTaUS7IEU7Ue1q33uFG5IkuZdTXtlHF bajlskNmnj/EbH+2FM5eaztw8MFeP2gMKPAPM8Eqng+OS/30hfTOIXnocTN7ORaBvag8IDRHd 1JbNCopIqZJIQXclkJgUfCiouNjd3z45o632kR7oCuZAxZqedaaYYZZKcVns28r/MlCJL0S0O pcrXRTcK+t4hf7PEoiaZhmvOz2x3teZ01oJxsVRut54PU4QHBPvZq+zkA0u7te5HhwNA2O+UF WiIjUFG9QwCcFlkY Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "David S. Miller" commit 129d23a56623eea0947a05288158d76dc7f2f0ac upstream. This fixes: -- 2.9.0 ==================== net/netfilter/nft_reject.c: In function ‘nft_reject_dump’: net/netfilter/nft_reject.c:61:2: warning: enumeration value ‘NFT_REJECT_TCP_RST’ not handled in switch [-Wswitch] switch (priv->type) { ^ net/netfilter/nft_reject.c:61:2: warning: enumeration value ‘NFT_REJECT_ICMPX_UNREACH’ not handled in switch [-Wswi\ tch] net/netfilter/nft_reject_inet.c: In function ‘nft_reject_inet_dump’: net/netfilter/nft_reject_inet.c:105:2: warning: enumeration value ‘NFT_REJECT_TCP_RST’ not handled in switch [-Wswi\ tch] switch (priv->type) { ^ ==================== Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- net/netfilter/nft_reject.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nft_reject.c b/net/netfilter/nft_reject.c index f3448c296446..5d5d1df34f77 100644 --- a/net/netfilter/nft_reject.c +++ b/net/netfilter/nft_reject.c @@ -61,6 +61,8 @@ int nft_reject_dump(struct sk_buff *skb, const struct nft_expr *expr) if (nla_put_u8(skb, NFTA_REJECT_ICMP_CODE, priv->icmp_code)) goto nla_put_failure; break; + default: + break; } return 0; From patchwork Fri May 5 19:47:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98730 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293517qge; Fri, 5 May 2017 12:50:20 -0700 (PDT) X-Received: by 10.84.248.12 with SMTP id p12mr4938235pll.155.1494013727061; Fri, 05 May 2017 12:48:47 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.46; Fri, 05 May 2017 12:48:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755719AbdEETsn (ORCPT + 6 others); Fri, 5 May 2017 15:48:43 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:52275 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755637AbdEETsf (ORCPT ); Fri, 5 May 2017 15:48:35 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M8u6u-1dCGav1pMK-00CE9x; Fri, 05 May 2017 21:48:29 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Dan Carpenter , Daniel Vetter , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 61/87] drm/i915: cleanup some indenting Date: Fri, 5 May 2017 21:47:19 +0200 Message-Id: <20170505194745.3627137-62-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:eBW/vUW1pgSNffIAb9Ucp6qF3OiPo+Cdooigks6tz68o0NLBwZI oRXIcP4ddzj2b5kvHCDNMhWOiDIqliLi48bo61tfzpA24ukwkkn87vruh5dK04+rZDx51fS uQtRppUs1bLgjQEbaPZh3oif5WEsjbRVxnT3PBgL8vYQ8msk2HoUwdtPWyAntpKnRrCTP55 OFddbNvo1bXyw1EDTdtFw== X-UI-Out-Filterresults: notjunk:1; V01:K0:eBnbeI+m5L8=:Jbg1eD+IGL5ESMyTlH3HG0 IG9gf/vluTjnqNTat0TsiI6D9ZcCf4jZj8MfYXDLBicgdH97WEAaMCU+I2AbmiPwYCHHDQO3G xz8sDm/r0zbLSc8ULITxGCvfdCylB6Lk6z8g124jH/TKIDORsxysisgBL2QoYcQGx3ofXyjC8 8pFwNLpvVoeh06o2A7IIZQgvlSZTYy0p8iPAtjPVXtSq51sxqxaLDCbA9WOHMnEkaVc6SWnky S48DL6tUeqccrMVWeXHgF0FJPV7KqQHW3wJfqeR/sVr0iM8b9ZJ8X5Y9ZQ5OKGGT0UGEXRIiv MQvcpE3bcHm6mZ7Xrc8a1pc+BdCo8XDhnE+EsNqnL8hFOQqRkjnBQ9Y4k/N3xqL8xaL2gQTE5 72IIh1D967eZCAUYloJtHerr8CjFtKnbn4EP8yL9DVE8MjYGIGmUa+GYSO6vJuK5uXpHVo6HP VEPqRCMW8skFMI5dPA8bL35fWz+En8PdA+IhBshKfVot0w84mM1jfx1X/dBfH4SHbzjAXTm0S 6Y2CxqGqewixOnLK8iQ8f/rgmEtBS9mBuUPHRRljtroNCEXvFTeo/EJScaszhLyvt1xtq0WQY kBo5Y4guDOfBfOLp9zb91QDilsBEAHSR8HNs0Nq7fFdYX6HbE+oC74BDEkPi8TEZluHGHVWb+ txmxfMDZgxgfmE5LVWh8TsAoYmgXbvZe4OHRcwZ3O0fgf4gjgfAdd0vwceVPsU494hS4= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter commit ba0635ffb7665d76715b43ae8144e014a90c1e63 upstream. Static checkers complain that we should probably add curly braces because, from the indenting, it looks like seq_printf() should be inside the list_for_each_entry() loop. But the code is actually correct, it's just the indenting which is off. Besides fixing the indenting on seq_printf(), I did add curly braces, because generally mult-line indents should have curly braces to make them more readable. The unintended indent was left behind and not unindented in commit d7f46fc4e7323887494db13f063a8e59861fefb0 Author: Ben Widawsky Date: Fri Dec 6 14:10:55 2013 -0800 drm/i915: Make pin count per VMA Signed-off-by: Dan Carpenter Reviewed-by: Jani Nikula Signed-off-by: Daniel Vetter Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/i915/i915_debugfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index b8c689202c40..14d2f2cfd88f 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -141,10 +141,11 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) obj->madv == I915_MADV_DONTNEED ? " purgeable" : ""); if (obj->base.name) seq_printf(m, " (name: %d)", obj->base.name); - list_for_each_entry(vma, &obj->vma_list, vma_link) + list_for_each_entry(vma, &obj->vma_list, vma_link) { if (vma->pin_count > 0) pin_count++; - seq_printf(m, " (pinned x %d)", pin_count); + } + seq_printf(m, " (pinned x %d)", pin_count); if (obj->pin_display) seq_printf(m, " (display)"); if (obj->fence_reg != I915_FENCE_REG_NONE) From patchwork Fri May 5 19:47:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98692 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292853qge; Fri, 5 May 2017 12:48:44 -0700 (PDT) X-Received: by 10.98.13.220 with SMTP id 89mr5266066pfn.112.1494013724338; Fri, 05 May 2017 12:48:44 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.44; Fri, 05 May 2017 12:48:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755682AbdEETsh (ORCPT + 6 others); Fri, 5 May 2017 15:48:37 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:63669 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754515AbdEETsb (ORCPT ); Fri, 5 May 2017 15:48:31 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LvtPB-1e7Vx50AzF-017kfI; Fri, 05 May 2017 21:48:30 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 63/87] staging: bcm: add 32-bit host dependency Date: Fri, 5 May 2017 21:47:21 +0200 Message-Id: <20170505194745.3627137-64-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:6whl+1QCJPNzT0K5BHnQwK/Q1DBXIRIrmcQb+NGZgnJC7vPfy98 gyZDKZQUkTRkmvHmrwMANoFc8e9/lGIVdSx+VYr545iCOMSO8apUK2m7YL0S23L7SAX1wwF 5U63wjzssA/tRZhD/Q5qg8XvqBIXLWqpHkUBbcxDhjWeVX8Kad2Ujt8T4l05Am/OSpuvaBj XSnpDogYBYWIzsIEaMtxw== X-UI-Out-Filterresults: notjunk:1; V01:K0:79M/3E0A648=:26LEoFs0/Hj/wVkd1zsghF bKDUXj4v5tLVkqoJYNmGB0AGhLOkyO/KY+GnT9aIcDSR82bfPNp3nZdS6/iuOd+7zt12iJ9Im vRXm5YahPkrswiKbkDKmGxe6jaOqULdNlxUJqpviQRsLUjHTLUPZ/ruy+nToURiyLZK1HzkGv xi9kkBXUwTu65oyN3YY+VSIvo6JmmtBDvoXtxqNSXJkJPAxTy5gsLxGFPlf5zQOnoZk8oZ6Tb Fqev8UNsshBQ87oLxd1ZvwUqXax1ZI4adXl+jl0r6gjY7+jRopNzqp60UKqvNfEWm43DarRrl bEaLvYsgwFQJjdCVzz5XOBnDG3trW3kFS30CMNYICJW851tK6OgZ1kXVVbuuO9XAAgfNHoXJj PRHPtt8fySWpzb3q4mn4VyTQypN2eCutyKk3WM/9paAa5FBEVCPbGnLWZOIBdDIdRzvBnotFZ Z/cu/Rs5xH56rN7uE+PnWZ+p3oTlbyJL6YUZCY0PfWP5hGQB8rK4wHPyCDL415DHdVx8tFNmh 6wlterCCPB/WCPGQxvSDFqI4gfKWWL51bBgqmUbINA43ko2SCwJcQyUueGXrCSpqiZ66gzOWY P/Klk0gCBJPAquKPqr+7xoJcpY0+i6BlzL7sypTEYXpaL1zxXarTFklNOumVIgJk6LWuaIa7v dNwTTv0U6LN2lbAcQrQZxJMCxIpTv2AP1OGtOO3Y3VS6FEQMGYYAF6jvn5OD1wbqOkTE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The driver uses a 32-bit variable to store a pointer, causing a couple of warnings: ../drivers/staging/bcm/CmHost.c: In function 'StoreCmControlResponseMessage': ../drivers/staging/bcm/CmHost.c:1503:3: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] (struct bcm_connect_mgr_params *) ntohl( ^ ../drivers/staging/bcm/CmHost.c:1546:3: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] (struct bcm_connect_mgr_params *) ntohl( ^ ../drivers/staging/bcm/CmHost.c:1564:3: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] (struct bcm_connect_mgr_params *) ntohl( I fixed other warnings in an earlier commit 9f1c75ac2dba ("staging/bcm: fix most build warnings"), but couldn't figure out what was the intended behavior on 64-bit machines here. The driver was removed in linux-3.19, commit d09e9b160fc1 ("staging: bcm: remove driver") which explains that it never worked on 64-bit machines. This adds a Kconfig dependency instead to prevent it from being built in the known broken configuration. This workaround applies to v2.6.37 or higher. Fixes: f8942e07a3db ("staging: Beeceem USB Wimax driver") Signed-off-by: Arnd Bergmann --- drivers/staging/bcm/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/drivers/staging/bcm/Kconfig b/drivers/staging/bcm/Kconfig index 8acf4b24a7c9..94e04701e008 100644 --- a/drivers/staging/bcm/Kconfig +++ b/drivers/staging/bcm/Kconfig @@ -1,6 +1,7 @@ config BCM_WIMAX tristate "Beceem BCS200/BCS220-3 and BCSM250 wimax support" depends on USB && NET + depends on !64BIT help This is an experimental driver for the Beceem WIMAX chipset used by Sprint 4G. From patchwork Fri May 5 19:47:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98736 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp391473obb; Fri, 5 May 2017 12:50:51 -0700 (PDT) X-Received: by 10.84.129.131 with SMTP id b3mr68385514plb.1.1494013728722; Fri, 05 May 2017 12:48:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.48; Fri, 05 May 2017 12:48:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755672AbdEETsr (ORCPT + 6 others); Fri, 5 May 2017 15:48:47 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:61480 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755479AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LZqH7-1dlbLX0zFN-00lq5o; Fri, 05 May 2017 21:48:30 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 64/87] staging: imx-drm: fix indentation warning Date: Fri, 5 May 2017 21:47:22 +0200 Message-Id: <20170505194745.3627137-65-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:GuaEqBfmPEHElGdQK2gclw1pLQOHOSgGh6gpvnIWC4KA4Cd5J2G /Xw4JDEtixRuqcaR3VQwhd7RBx5UWgunSBtoa6OURaD+kZinCgrk7a5yqpVOFa8db5Rcvun u7fdwJ0l7Qq8HcqFwVBZJ6bMP8qQ95B+8rJZ+d5RHxPKNeN1saMDIU6bxL2UREh5iJYAnTo VIsEbZ6igC01H/J1J3oFg== X-UI-Out-Filterresults: notjunk:1; V01:K0:YfHjI6TmIks=:YsMH6bZ1ZCLPJxPWgK1gNz Qc7cz//tjXgMY5UySKJa9U7Z+xkxAzOaRPTVhdnz7sjodbiTJCyaH3mfGl2ObbslxDEJz35ro u4kaaIcPMKvs9t+bwo1p09tEBSJs0BeZAzigbdiM3g6bAX05yjjac4ceSzMJiFTb17rwJRlqO MnzOSFFvBA3qN/vQKSvAZfZslv9ik16wS2AtCs5CS7FDLBptjqs4+F4+8SneDCjXvR2pNADuQ rgLowyfYwKZby5Yu+Ef6phq4k5igVtbqUs8bsjWFGEmnWllYzFZWiLjJ8n3DhNkn0TT8J+16C JmwaKWyOzKYNSoA35Xr40VPdaV6huddE9olaEq+3DE0KMV6MYOJH7GfHPkMtti61DAIicEB43 1m2ad/ua+1QJUPhM1l/fQPTPLEITX7vnjbaTv7dvdRqZXRJZwDMRko+nNczKYc9xGEX5xM6sg H/+NqRRD9vGVlwthv8dMU+HJ9gvGHELUtKdNCsjDjH0vGDLvqWvitDLTd8pZLJ5cJ5MkGmH8b 002rDEiR9ZNEA8mQ9qA7jGDwrH2RSF3Vn7SWmApYiBwQ1bNg7XW6KkmVkAly3KWTjS+bkI75h YyjymAEFeU5bj6+IhQL92h+uzwAf96c0E4+sB3ElIV2buGCPLLMtt5BjOveyYkdqaTzvHFLKA FoUXyz3TPBq+q7PApGJtmfaXIe2CULdSHuwZ9N75c1PBWSqDQV03Hh6k0oYQPV7urVLQ= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org gcc-6 produces a harmless warning: drivers/staging/imx-drm/imx-hdmi.c: In function 'hdmi_config_AVI': drivers/staging/imx-drm/imx-hdmi.c:967:2: error: this 'else' clause does not guard... [-Werror=misleading-indentation] Commit d083c312cba2 ("drm: bridge/dw_hdmi: simplify hdmi_config_AVI() a little") in linux-4.3 fixes this with a larger rewrite that is not applicable here. After that rewrite, the variable that gets assigned here no longer exists. The assignment is rather pointless here, as we just set a variable to zero that is later added into another variable using a bitwise or operator, and that has no effect, so I'm just changing the indentation here to shut up the warning. The driver was originally merged in linux-3.13, and the fix applies to all versions between that and 4.2. Fixes: 9aaf880ed4ee ("imx-drm: Add mx6 hdmi transmitter support") Signed-off-by: Arnd Bergmann --- drivers/staging/imx-drm/imx-hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c index 18c9ccd460b7..6943449a8a48 100644 --- a/drivers/staging/imx-drm/imx-hdmi.c +++ b/drivers/staging/imx-drm/imx-hdmi.c @@ -968,7 +968,7 @@ static void hdmi_config_AVI(struct imx_hdmi *hdmi) else pix_fmt = HDMI_FC_AVICONF0_PIX_FMT_RGB; - under_scan = HDMI_FC_AVICONF0_SCAN_INFO_NODATA; + under_scan = HDMI_FC_AVICONF0_SCAN_INFO_NODATA; /* * Active format identification data is present in the AVI InfoFrame. From patchwork Fri May 5 19:47:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98693 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292855qge; Fri, 5 May 2017 12:48:44 -0700 (PDT) X-Received: by 10.84.128.47 with SMTP id 44mr66810969pla.35.1494013724740; Fri, 05 May 2017 12:48:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013724; cv=none; d=google.com; s=arc-20160816; b=TYlZeDvZCwlGl+o93h2/8RNZRerqZ8KQe9Dlv3Z2ap5K4pmOrSbJB9U260fs2hHsBY UcnIvA6TJQvdwe5qIN2rkfa+e5mcnAmugMSA/Gl92FQfSgFbfiTbTROv1lZEPWNORmeL beQzhY6W6Rd0m3wZrjdwZVBDBrH4HbdZTFAU20bAJrXzQxy/u/7SzfZ+TtTrxvyZaI/M 1I/j1HKOX7miT1hj70SEcmA3xBMhyYipRxHN1Qv6/+TL9A8L26dcjESGB96OaxFVAz+w KXpOIOjArz0GkaDXqt36pFavEkjpOQPb8uoWYiuqLK058vGzrvaxdiWfQQrFb9h7C/4E Cf+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=FzZq1qx33bNCZeHc9d+lMjmALdnGf+IvRTpqbwKOso0=; b=FtqMeQZUxujHDZSrkks8RwvfV65tJhMDIM6ArMzqvKUZNVYulpVV4uchhElXDnfxs5 zP1I9oZIyubue07SuKbNvmnAmJUxTHjncUwwuJJO4yYkxtGTZgNZAs4DOpinoMG93u9n 3aLq4TX98gENo+IsSVCqzWFi1o2ILywcVB2vD8RyrWXRd9UsJFjp8MyRjQDSE5O8q0KW ygTovFdURw1PGKYkPDgp4gUCfwytVvGb/PlU26sW4Uc0YAyqBKpqun51znxOmTnDxFSZ o4kxhra7mOkmCp1cNgasLUJYpTXot0lQGKqESB/31NA7BPE57jhJLbyDyUgEAb9XnlQx ROUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.44; Fri, 05 May 2017 12:48:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755715AbdEETsi (ORCPT + 6 others); Fri, 5 May 2017 15:48:38 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:61480 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754768AbdEETsc (ORCPT ); Fri, 5 May 2017 15:48:32 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M9B5p-1dCXZr1lpV-00CVH6; Fri, 05 May 2017 21:48:30 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 65/87] staging: vt6655: fix overly large stack usage Date: Fri, 5 May 2017 21:47:23 +0200 Message-Id: <20170505194745.3627137-66-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:+OErm4qW4GqVjTdfROLgUcEHAEaxbEYzJsIyiu7KbWwUX7kyXEw iR8vcGYsjncCIC2BMA4XiR0p5aXC49Omi5c76hNMfq91Aqh9wRRreNUHHeB2sYl+zmwk+4g 6Eh1MhASGbaehX8mjqSwatV9xWKC+NL4GBlGWWZQSEbpYJHjOrUmCPNg8tJlefe99a7wA/j HOU5O5cQqUg0CyBUscPHA== X-UI-Out-Filterresults: notjunk:1; V01:K0:IYNpyHZZwSY=:93/F72y1aZ60aaLWvHRZme O5INIYTHLzfT3UkgxlJpVNqYoNNBwQYNU1bX3O/7PqQoiszbaMFOqEQBSLr00GUJMvMfKXFkp L+NMkkBYxLIZAPxKQgRl6zceaJVZCzwe652xoeZRQ+iQ8/NnVpxtLvHP5QBP5abX/ev7j8png ZUy8/HqijZrzjByxSJhGFP3hKhmyd0IxPPDGDNPhnJXzU4RwDwTq2UynMxzVFf+/d81YfNSYi /qY/0Q2xfI1nd1l/yiScaOHQshVuXy5zUKqvho2dXgsPba4wqZz7QjSrEQPzem8LrGbslFaVC 1R799awUYp0aOkRseSxpbPKSq1u6/OLsvnbVYzIjtA0AreV5/4id79F5wW9AOG7zdqm6ZnHrk Ozun6M3aesUJD4tOug5BfVXQ2hyI0R0dMV7XG/pXjxe214LYES2Xr4YGaWTwAxdNsXiWhGKXI kXqwynRNBMbBchfdHHgLRoYxUNJ1lmmZG2KtwtY0Cne0DFm1NcRb6S4we3KaBayWivuHdeTum XJPt2Lr9hch/WjbRy4v+KE3lVQMM+rnP5ejvI1o5mFbHB6kptCsxJcpHidPUex7t/sPkXQVeV 8GgmjKpuL5BX06hjdw/WeH04HPIP+S/XGBJF7VAYEtEoUEp3caNJbNrb5fw+/BWPOCU4ClBpq 6s7EsD6VyOOaXIuYNKH+T4K/emLG/qBt86prb5aila/nyP+yu8CxnWWifudzDNLlaXHM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org We get a warning for the large stack usage in some configurations: drivers/staging/vt6655/device_main.c: In function 'device_ioctl': drivers/staging/vt6655/device_main.c:2974:1: warning: the frame size of 1304 bytes is larger than 1024 bytes [-Wframe-larger-than=] This is addressed in linux-3.19 with commit 67013f2c0e58 ("staging: vt6655: mac80211 conversion add main mac80211 functions"), which obsoletes the device_ioctl() function, but as that does not apply to stable kernels, this picks an easier way out by using dynamic allocation. The driver was merged in 2.6.31, and the fix applies to all versions before 3.19. Fixes: 5449c685a4b3 ("Staging: Add pristine upstream vt6655 driver sources") Signed-off-by: Arnd Bergmann --- drivers/staging/vt6655/device_main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index e3ae2599a2b7..88ffe31053ed 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -2933,11 +2933,13 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSENS \n"); rc = -EOPNOTSUPP; break; - case SIOCGIWAPLIST: { - char buffer[IW_MAX_AP * (sizeof(struct sockaddr) + sizeof(struct iw_quality))]; + char *buffer = kzalloc(IW_MAX_AP * (sizeof(struct sockaddr) + + sizeof(struct iw_quality)), GFP_KERNEL); - if (wrq->u.data.pointer) { + if (!buffer) { + rc = -ENOMEM; + } else if (wrq->u.data.pointer) { rc = iwctl_giwaplist(dev, NULL, &(wrq->u.data), buffer); if (rc == 0) { if (copy_to_user(wrq->u.data.pointer, @@ -2947,6 +2949,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { rc = -EFAULT; } } + kfree(buffer); } break; @@ -2993,7 +2996,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWGENIE \n"); rc = iwctl_giwgenie(dev, NULL, &(wrq->u.data), wrq->u.data.pointer); break; - case SIOCSIWENCODEEXT: { char extra[sizeof(struct iw_encode_ext)+MAX_KEY_LEN+1]; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODEEXT \n"); From patchwork Fri May 5 19:47:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98737 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp391478obb; Fri, 5 May 2017 12:50:52 -0700 (PDT) X-Received: by 10.98.10.71 with SMTP id s68mr18572625pfi.78.1494013726743; Fri, 05 May 2017 12:48:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013726; cv=none; d=google.com; s=arc-20160816; b=DhCrNqNVYE1x+9K1NiiQ7EKvaqvvOKy47cr1xjshN3SgG8jbILu4nGigfMwGybUAPa 8DCvr8Zkc6M37eIiESpI2ka6vPXpcwqXn+u0K2mrxTagrtzTi3r6AzqXTOhhYlRFo73P 5EUoghDY7a0xqG/fDWFH4BvqY76BCpvAYWMco7e7J1U0Tr7aXCba+09hTjlkBkI24kVc bS8eddGER8+0FUx5R5IdTA0cC13YDbAVi9TJ6JPvr2/yUm0mqHdbOiHsQi29FlWWw8hS s0rNnHavwpsxfaQ7/BClbNWHdCyRKk+glGELmIMEYC+oWuf5y7X+KnRtj+jyI6yQf9Fh qzOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=08NnCkym864CDk6STq3i9tknWXbv5WiclDdXY0xFd5U=; b=fvR43Z85XfpO+f7oKEmCZt2v9fAA0aDZ7FI6w6FLNTeG4GLxi/e4kcikZ6PqE+O4qp sTp+IvNsLID6UnryBIHA88ZEVQ9p1ueLpHJkQYiICDJVzLvs8kJi0iH2uxaCkxahAXEQ +WXMEGfl/nP/JOkUUjforTfo6IXra3YEyBkx797twqBnbUM10SAnejUpGHklqKVrar2L KtN7utrhBY8e4hTTovIExuY5e8c6n9+LTw7UybTPokwX6LrMAmnwQhgxzU1yaWLYdSxz NfKLlpJcaI0VHI8l7MhpoiaRE66T0NN937OfVeiAhWc9g4IkPdAO7q2RQe8aJpurBtUt Xuxg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.46; Fri, 05 May 2017 12:48:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755800AbdEETsn (ORCPT + 6 others); Fri, 5 May 2017 15:48:43 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:63519 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755640AbdEETsg (ORCPT ); Fri, 5 May 2017 15:48:36 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MG2ic-1dJO8m2ttO-00ExBr; Fri, 05 May 2017 21:48:30 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Colin Ian King , Jonathan Cameron , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 66/87] Staging: iio: adc: fix indent on break statement Date: Fri, 5 May 2017 21:47:24 +0200 Message-Id: <20170505194745.3627137-67-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:MXC3QKVr+wBnJpce3AsfqCJ6YyzC9Rwbr68zi19XmtoFJezL6e7 a+i9ORf0DuVhztVtLxbdwKRbG784Tt+1QNSjOaNRbQj7mS+H06IUYn5Xm079QjDjmyRnWDF 7A/6EcQI58a/fLFrAyCWhYcA+xf7fGQ/iNKVjNH6L9S3yxfTwMLvO03Vj3cOwWVVW457hGM dJJaimY/ogc+Nwnbt0yWw== X-UI-Out-Filterresults: notjunk:1; V01:K0:NX2ibAMT6cc=:oG13T0f1pC/PUETinvIYwH B5bLOgdPcCUNjPPKTWlN5aCguK6UOfzQkx8Ru/7cHQf4+Esx2XzM+2HFGds+e4Ay1Q5JDAzKn z/R8kzsXVD3kjc00tEW7579WlZgXd36/f7fO+mlghF6f8ER8Rgh4H8tOynOrxI/od/4Voy1D2 u27o57dt3OVWC2OmA4JL4wznt4DGV5ZZXgl2XjHcagJObW4XY3V+ci3DkbxOvgPBpfkwxy4I6 GUG0q1pOQHpcbAL1Hpshzzw0uEc1+ixQPbo/EjwcI5ubwkPu1G1DF4qNgAGWCpXlFWil/kmju 2m1D/lOoPefLQJM2RZA5U0AGho2zWj4qHyMvEXH9rn3CvuZE77Zs/c8UIf/y6jHYb1+1yO1qd 1YL8xkLGWNtEuH1mEYlEbzlskV9Pv1c/qtTHKY2Iu4B8kURAQOqtuEvsaQlaG8lYi5zXIO498 P9WFr6ot1mq8E43iRUidgk4TpR/WvraTZKN1FWV22MzHVhv9sfCyNKdG2cLZRO78Ca1/jRTiw kwhxGUEaKZ9Mw/IEvZ2wMRimStwz7YzKWpiuuLB+7wEltWIU9+EZnufi1fI2s1VRcrECNoMrz nK4zX9MD3OVusVqYeyEeVnhDhBjG8kC6PW7lQvcwyWXA46ZAl1fvAd7hTYUuXRYB6UxB2QCV0 sQbCkdWpPmAodpauwe4gnT4KIEsK/tsDe6PDIbOFtDd7AG6Kkw02RpdlMtY264VcWaE8= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Colin Ian King commit b6acb0cfc21293a1bfc283e9217f58f7474ef728 upstream. Fix indent warning when building with gcc 6: drivers/staging/iio/adc/ad7192.c:239:4: warning: statement is indented as if it were guarded by... [-Wmisleading-indentation] Signed-off-by: Colin Ian King Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/staging/iio/adc/ad7192.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c index 83bb44b38152..26b2cdca29ad 100644 --- a/drivers/staging/iio/adc/ad7192.c +++ b/drivers/staging/iio/adc/ad7192.c @@ -236,7 +236,7 @@ static int ad7192_setup(struct ad7192_state *st, st->mclk = pdata->ext_clk_Hz; else st->mclk = AD7192_INT_FREQ_MHz; - break; + break; default: ret = -EINVAL; goto out; From patchwork Fri May 5 19:47:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98701 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292903qge; Fri, 5 May 2017 12:48:50 -0700 (PDT) X-Received: by 10.84.164.199 with SMTP id l7mr21152094plg.11.1494013730176; Fri, 05 May 2017 12:48:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.49; Fri, 05 May 2017 12:48:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755758AbdEETss (ORCPT + 6 others); Fri, 5 May 2017 15:48:48 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:49798 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755659AbdEETsg (ORCPT ); Fri, 5 May 2017 15:48:36 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MEwG2-1dIIk84ADC-00G4BT; Fri, 05 May 2017 21:48:31 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Dan Carpenter , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 67/87] Staging: lustre: missing curly braces in ll_setattr_raw() Date: Fri, 5 May 2017 21:47:25 +0200 Message-Id: <20170505194745.3627137-68-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:kpx+2oEr0xNiM2KVfZGd79kx9olpEnjPoL3HAxGvvBQoFMeHiER XErmd4U1mE21P9kcObe1lfhI8J7M/ANLmPDusJNqYUavjLEKfadLtgIoKFOi1Ll7wbLwJEw PHhNGr43FKVKblDrychOU8LoBYeWMr8rnfjPI8ekEPABxd1acNjDmrGs0u5Gz6N0rBmiznF 3fQRLgECcdTuu7Plu/o1g== X-UI-Out-Filterresults: notjunk:1; V01:K0:dlh1Irl/Z5Q=:qjKf8kq9nPgNs8tf2KbSXP +rWNOK5QJ6HJQEss7em4LM/AT9XFzUW2kp8aH+wV5bVQbWyVFpdwwZXslP5NYVPLDKNsY21Db wrnmYbQG6nqnkLud165IgRTArARGrq4v2/Mq2PQ3/u0mbfZNpwlQVaWTp4k8YYNFBiOGUmeLk fG1F70GBXNxvdwsw+arueZjn4wkZd3qgVttEyJRgbH3IYqekQvpIMrPut04hMFAQXQqi+RscU RBhXIzsVI+Ke0IHs40OnLG6QJhtblXtt8mc6nhYrSpObsACoEbvH9GqrZPx8TiN5g1XtmzQUe wC0VUVEgVO6GbJpSeSaRxXWicxbH1qafTgoUrxD+IosvJRBmwHBjhus1W1nwVcGCsn8siYPX/ smFkZEwf0V1SwU/h5K/MU+k22oj64y6WYo1fxEGH2qu4ub05kiqe42AkbCTBPv4qFyCmfre8N nKjLgmpP9ec+3LngAH6UUGgwDr/tgiMSBC8uoQfKJEsF7qx5wYoZK/giOQWe6js+0I8cd4xVY oxa5r8zoIaXcTASR2A8xmp3o9UF55pSZm54Ex+bwhVcfEEBAoKsGOj6KRMMVIH4UZA+JZRVCD Uvf73XumW5WUyBJLi803epSiMdFi4Qm/ZmjxYw4ThlfPthbWwNe66K6uafAbsXh5Rs7o5+dxH qRZY12cilJhz/Qk4QZiC6HZpSXjzMb0AzBAcM55OojUu5PiID81dHchtRjUohMWZ+JeM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter commit 53bd4a004ee5ff0f71a858de78faac98924b4a87 upstream. >From the indenting, it looks like curly braces were intended here. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/staging/lustre/lustre/llite/llite_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index 17cfa99b4fc0..764953089f64 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -1489,7 +1489,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) if (attr->ia_valid & (ATTR_SIZE | ATTR_ATIME | ATTR_ATIME_SET | - ATTR_MTIME | ATTR_MTIME_SET)) + ATTR_MTIME | ATTR_MTIME_SET)) { /* For truncate and utimes sending attributes to OSTs, setting * mtime/atime to the past will be performed under PW [0:EOF] * extent lock (new_size:EOF for truncate). It may seem @@ -1501,6 +1501,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) rc = ll_setattr_ost(inode, attr); if (attr->ia_valid & ATTR_SIZE) up_write(&lli->lli_trunc_sem); + } out: if (op_data) { if (op_data->op_ioepoch) { From patchwork Fri May 5 19:47:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98727 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293492qge; Fri, 5 May 2017 12:50:16 -0700 (PDT) X-Received: by 10.98.49.195 with SMTP id x186mr18577774pfx.148.1494013727888; Fri, 05 May 2017 12:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013727; cv=none; d=google.com; s=arc-20160816; b=j4EFyAqrfpUPcuwCvMNomEZOg2bF+Q6DzcF2aobd+a6iPHypd9wIL+GBnirbIu2zuw 2iXxcjlOA1ktod9kDvtIDIMavoeV8G0IIyxCfXCixtBsvU6MZyvgier+gvwNyPktv79d zaHTEm385SNGZcCNjWcwb/4kUAKZpk1HAGcj9p6cMUeAYu2Xw2aumnhxI8+wA4WCCOAF 6shwodFecxCAmte3YpKLHzOQBwlIY2XsipDq3APkPY1nC7gZSk9kfS1gdw7hhubtd10h ebr2EsCcf8UB86syOrOjVWheT7gFNna4EuVXXZC8LQfu+UDvSkdfSsxM8OQSrX609byW 4OFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=DjQinPGVT4h4orL0bHuOqsOGt4dpAR5/VSTnpwQgntU=; b=yhmMoxkaE7LefckRFbxYnHiKLQ+gU9aLml/a9dPdBcD2CyrjMj7G6eWdDQYPw/9EGx OAfKlk4hn+++EVwgMfFSvNYGunzVTlJ19Pw6xz6TiHIE8Woc65WG//qxbjQuQFC+VOfa HJgZ3sWBUi4GR5Cq+KWEp2YTEviIn8FZI5m4WL/9JWPYaPkBsAxoJ+Fc8Ty9PnW4nu4x zWWXdiypTjcvJpWjx2itauuvQgg/h4hZoihoK235VyaiZ+uwkKeHHiNc7cKPlytWodHa NImfCHj4tXDJTtwN5rqtHO6vWjnHuUceOrwvibJe50i3tOK9MKgTTMEJJUHUsNj6smM0 0F9w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.47; Fri, 05 May 2017 12:48:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755562AbdEETsq (ORCPT + 6 others); Fri, 5 May 2017 15:48:46 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:56516 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755660AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MUQrq-1dXdld14M6-00R0ON; Fri, 05 May 2017 21:48:31 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Luis de Bethencourt , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 68/87] staging: rtl8723au: core: rtw_wlan_util: fix misleading indentation Date: Fri, 5 May 2017 21:47:26 +0200 Message-Id: <20170505194745.3627137-69-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:kmmDCdNhujflcuJ8T2a8NhZp/NQIw7Gao7JOhlD4KCFtgzxX7IY 0uoCkCbPlAefZJr5BYKxihl5YWx6CpEbTVYpheczUobkaJF0me10iPQxsMXva/fNcBfxLub ZrwC9k7fWha8lOJyGZkE2r//6R+EGZjt2bCYNksZvmSSOzPfkVuXhPmqbJl9datkzL9udM7 AkBWGfOiROl3uDXh7c+vA== X-UI-Out-Filterresults: notjunk:1; V01:K0:je9PmmGx+XU=:ueBPuP8sPxRI1OkGtMVlA9 YtraP9zhlu/sQA03HD3drTR8z4b604FC8q2JvXRy1VMgToxBTQ1AMCzfaEyNi0xFwV5Ikcu0I iXTKMIiTwIoqIA/m6fz0KH/onUVxkCsI+Drq3bM9LEwNfIu48Q8crg77WzX/YGRafM/nZnAIj oNdttM5/IcrVBMAKNB1rUNPA7xloQ64RE5vvGG+ZFBPZo7O6LZgzt6ySLbuElGNKI8r/bDzvr Rlp03oBkVWwUcIgN49CFnb8VyHKokT5MLS4wk+/4FRd8ZdEcl3AJLUOdMZr8AGexwsxoiaJd0 ogqaDaApdZoKc1AE/tBD+yZOVIeMVkUwFADaT/uI06kBPNbrjVv5usBSbNDzAv8yuRSPRbNSR Oe93bV8MuFfyABXWlIRyYkrBhFPjef9M2MCc2L7Iodmb3J4acBJGwBgUmWxlCEmwhVFqD0OLi 1BR+GKsgaxi3GwiUBvT6EdqR71+zqcdgbwu/vzinpIXeeLePxRVhM+2MfGRVWLL/xJxY4R79F R9gc3JGSM902pKinkcGLCslWrzMDpFSbZ3tKjqoDoPL+7xA0nBgDc/UgrKq5lFmImo5phxVUT 2/wmHjbPd/yD3fJ16xX7GS+P/eyQ7EfFJ8nLOv67JKrZgu19NtHLx2p+i5LB/c3aOYaWbSN77 M4yozLHRnatmiIfxsuPeGb4nDF6uv/fs/ZnU3yiZRmqeqOse9HdlK1ied5kwxt6cbg0w= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luis de Bethencourt commit 8c182ae20791d638c07ff499709c4a1d4697bd7c upstream. For loop is outside of the else branch of the above conditional statement. Fixing misleading indentation. Fix a smatch warning: drivers/staging/rtl8723au/core/rtw_wlan_util.c:528 WMMOnAssocRsp23a() warn: curly braces intended? Signed-off-by: Luis de Bethencourt Acked-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/staging/rtl8723au/core/rtw_wlan_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c index 579a4a8c8276..013ebd9629f3 100644 --- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c @@ -546,7 +546,7 @@ void WMMOnAssocRsp23a(struct rtw_adapter *padapter) else aSifsTime = 16; - for (i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) { ACI = (pmlmeinfo->WMM_param.ac_param[i].ACI_AIFSN >> 5) & 0x03; ACM = (pmlmeinfo->WMM_param.ac_param[i].ACI_AIFSN >> 4) & 0x01; From patchwork Fri May 5 19:47:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98720 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293330qge; Fri, 5 May 2017 12:49:57 -0700 (PDT) X-Received: by 10.98.26.6 with SMTP id a6mr18898058pfa.10.1494013797387; Fri, 05 May 2017 12:49:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si2689373pgp.198.2017.05.05.12.49.57; Fri, 05 May 2017 12:49:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755998AbdEETt4 (ORCPT + 6 others); Fri, 5 May 2017 15:49:56 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:62232 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755660AbdEETs4 (ORCPT ); Fri, 5 May 2017 15:48:56 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lsc93-1e4Eh42O2T-012H12; Fri, 05 May 2017 21:48:31 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, A Raghavendra Rao , A Raghavendra Rao , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 69/87] Staging: wlan-ng: fix sparse warning in prism2fw.c Date: Fri, 5 May 2017 21:47:27 +0200 Message-Id: <20170505194745.3627137-70-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:fKPm6xeiGDFnwRpjFTV9386vNd/tdrqbqn1HeX/wVup3PEknyWM bGKBBJUBZuxE6jDTvmU/s1ocAXfv9yiApAB51y/IaG/DlO/enh3wV0erJmNOQGRh4QjWTea KIVfgI/vprEIqm+tOTiSFFzQcG8tcI9Z2JsodnR+e5kzsySP1RbWLbdRq3wqdxcbtdfmSMK HN+WegHzfyMqyfQ7HHd/g== X-UI-Out-Filterresults: notjunk:1; V01:K0:XP2NtON9pY4=:CBpzoCvSxx4l2TIivqomhg mZAt0tZsWKX5Cg4CSNNBQKXOeTbkJHVniQy1f6ttD8y5nG0Nza7oDzBb56hVKYlv3+2RUPtYR 7EUNc9/NKT4n7GCRvLb33qgwGBjEx+yGpnDLLFKNMjfiNcUAjYnpHKj9gTgTFnwX6VBc1oTzb BrussqX7I1hWtx2WbzhB9GL7XRTD4fOulB/g2FySRIM3SWoXKaaYFfgHFn6jp4TQEHDHXlLLx jZBRRuuTL9gxcAvUVWitvgKi3U/k2MawAtDnTm2T8zyGmu/V9fOqqN2wfxNzf1RFW/qASmeqR gz3dRzug3GBM5674neddETXbRRhXBlXsbTY4T6NJjmdUf5LIRcZWZwZ/kwkTRJchs0uMPlx88 YRRJPCtPGepHfdVXPiVt/EBDJmg+MphoVPmAKFZheDNZNKWfRK63EZCnnhPR4OIQxTffmr0vW Xjfk16WLE8lhPSu3fv0o8tg9+XwR7CJCY2V9DQaywTmVBphN8r+iZEWAgbB5r7xWE44f0elWO rerstXYbFmTdRnp/94+n+YBoO95BtOUOM0xafdk3AqYLkh/Iaxspao+PngUVsYWyHXAktIdJb PbCRi+7Dek/Vqn7sz/eT+djcQuXcMxaBCFky+3n/twkwYDHnZmh1R133BGCXUbbzyV7PtBfGZ 06YiTGuNNjhQRMMLR2BKM9NmA4r3c23CglxF+ANAeCbRzI/VReJPKXitBCz7KCIZP0G+Xp0ad eWl/vBORSo16YTES Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: A Raghavendra Rao Commit da00fc79ae504f0db7bb1c03efa40f4c6cae883d upstream. Fix the following sparse warning : In file included from drivers/staging/wlan-ng/prism2usb.c:5:0: drivers/staging/wlan-ng/prism2fw.c: In function ‘read_cardpda.constprop.43’: drivers/staging/wlan-ng/prism2fw.c:792:1: warning: the frame size of 1068 bytes is larger than 1024 bytes [-Wframe-larger-than=] The variable to 'struct p80211msg_p2req_readpda' was previously being created on the stack, which inturn exeeded the frame size limit, resulting in a sparse warning. This patch alloctes the memory to the structure dynamically and the operations are left unchanged. Signed-off-by: A Raghavendra Rao Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/staging/wlan-ng/prism2fw.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) -- 2.9.0 diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index f7870355c69f..45182ea4172f 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -763,30 +763,35 @@ static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks, static int read_cardpda(struct pda *pda, wlandevice_t *wlandev) { int result = 0; - struct p80211msg_p2req_readpda msg; + struct p80211msg_p2req_readpda *msg; + + msg = kzalloc(sizeof(*msg), GFP_KERNEL); + if (!msg) + return -ENOMEM; /* set up the msg */ - msg.msgcode = DIDmsg_p2req_readpda; - msg.msglen = sizeof(msg); - strcpy(msg.devname, wlandev->name); - msg.pda.did = DIDmsg_p2req_readpda_pda; - msg.pda.len = HFA384x_PDA_LEN_MAX; - msg.pda.status = P80211ENUM_msgitem_status_no_value; - msg.resultcode.did = DIDmsg_p2req_readpda_resultcode; - msg.resultcode.len = sizeof(u32); - msg.resultcode.status = P80211ENUM_msgitem_status_no_value; - - if (prism2mgmt_readpda(wlandev, &msg) != 0) { + msg->msgcode = DIDmsg_p2req_readpda; + msg->msglen = sizeof(msg); + strcpy(msg->devname, wlandev->name); + msg->pda.did = DIDmsg_p2req_readpda_pda; + msg->pda.len = HFA384x_PDA_LEN_MAX; + msg->pda.status = P80211ENUM_msgitem_status_no_value; + msg->resultcode.did = DIDmsg_p2req_readpda_resultcode; + msg->resultcode.len = sizeof(u32); + msg->resultcode.status = P80211ENUM_msgitem_status_no_value; + + if (prism2mgmt_readpda(wlandev, msg) != 0) { /* prism2mgmt_readpda prints an errno if appropriate */ result = -1; - } else if (msg.resultcode.data == P80211ENUM_resultcode_success) { - memcpy(pda->buf, msg.pda.data, HFA384x_PDA_LEN_MAX); + } else if (msg->resultcode.data == P80211ENUM_resultcode_success) { + memcpy(pda->buf, msg->pda.data, HFA384x_PDA_LEN_MAX); result = mkpdrlist(pda); } else { /* resultcode must've been something other than success */ result = -1; } + kfree(msg); return result; } From patchwork Fri May 5 19:47:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98707 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292962qge; Fri, 5 May 2017 12:48:57 -0700 (PDT) X-Received: by 10.84.241.77 with SMTP id u13mr7152914plm.28.1494013737488; Fri, 05 May 2017 12:48:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.57; Fri, 05 May 2017 12:48:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755929AbdEETsz (ORCPT + 6 others); Fri, 5 May 2017 15:48:55 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:51993 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755720AbdEETsj (ORCPT ); Fri, 5 May 2017 15:48:39 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lnots-1dhyqN3ULY-00g15B; Fri, 05 May 2017 21:48:31 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Konrad Zapalowicz , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 70/87] staging: dgnc: Fix frame size is larger than 1024B Date: Fri, 5 May 2017 21:47:28 +0200 Message-Id: <20170505194745.3627137-71-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:c/P8/ud6kh5r63dOAqpRyvcPNPH7sYfqG95IkT/+3ytwUGipg+j RxaZ9iHiWeKNGt/ghH5txwGNLH4koT+e4w15nHCQyV1yyro9IwVgq43VVMYRFVmm3vd8A7i zfpjKKLTxGQPFS/EolOd7vZolQJmeplgpnQyt2M3/v3ouYkuMjnK0J36BNf2Wc0zStTThsG pSQIjQq6+dz9NUlZq2v8A== X-UI-Out-Filterresults: notjunk:1; V01:K0:IFPyxd2H1yo=:s3M+WFR8E/4pbUTdVjcmGv jof4pV7jaiMVGM8T1C4C2DRjY8DoT3FweEE7tyA2a5+djnTSUWYrn6dGwyTME6QgA4o2/aM53 OTg25MG0kzT/NAek4QjnRF/qgZYrnOT7KLL4FQ4+044Alzgq6ONg0SgBdiIdki21mIFuR+igb mIHzlj2Rb8UOnwHXBYvd6JZCLFnXXCpTRfYjHyOqAdKNPgBJzS3zLvTHU95AFCLxhHmFH7ml1 0TaxWfFes/A1MK0//DzMzF+EMSDEpKzIj2YXiBdlA/DjFiaiwH+VSLN97aOez7KZ44ZunQGPR 5w0j0cUEH4N/K8SupIb3vn/7mhSwNl6tmWzctM17GT0rDdhUKHhoPgsZtC2b+ZFHfqtTdu9TC GlwjZE4F8ZPxAXjASAxytFLZEUh4jRwRMbq+IHbI9bzfDXAWxoOKUWH/J86Aj9uk/4bJb1JH8 AdUEJh1m9TYwNwX4Wxm/+tIrSlVNSPByYDa83e637UV9M/FLjkIj9WHYf7q+5KL78IdzCLFRz Ju1AQ1H0rg/4ZrUH6otZUrpFhdLu/pjWxb/vx/sGIaEGmwtArekJo9cssct/DungLZIJHz1gs JMYKn4joLl+ip0qZQfTyObDuhmamdgcDvHd7LwoOp8zgpu3JuSvwJ5waHoTiDA3koZfniPRUZ oFXkt8FCx3kxKyTKe5dDg9S2PdnplvThDKn52mBzxYYdygoQQdkQPLi1b9oyizAT37xc= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Konrad Zapalowicz Commit 59939d1eaadbb374b04648a35ff5560db58afeba upstream. This comit fixes the following sparse warnign: drivers/staging/dgnc/dgnc_tty.c:572:1: warning: the frame size of 1060 bytes is larger than 1024 bytes [-Wframe-larger-than=] This was caused by having buffer as an automatic variable. This commit moves it from the stack to the heap. Signed-off-by: Konrad Zapalowicz Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/staging/dgnc/dgnc_tty.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 4135cb0ed9f5..cd7a6dbdddb8 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -481,13 +481,18 @@ void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int int nbuf; int i; int tmpbuflen; - char tmpbuf[TMPBUFLEN]; - char *p = tmpbuf; + char *tmpbuf; + char *p; int too_much_data; + tmpbuf = kzalloc(TMPBUFLEN, GFP_KERNEL); + if (!tmpbuf) + return; + p = tmpbuf; + /* Leave if sniff not open */ if (!(ch->ch_sniff_flags & SNIFF_OPEN)) - return; + goto exit; do_gettimeofday(&tv); @@ -534,7 +539,7 @@ void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int * function was probably called by the interrupt/timer routines! */ if (n == 0) - return; + goto exit; /* * Copy as much data as will fit. @@ -579,6 +584,9 @@ void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int } } while (too_much_data); + +exit: + kfree(tmpbuf); } From patchwork Fri May 5 19:47:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98728 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293493qge; Fri, 5 May 2017 12:50:16 -0700 (PDT) X-Received: by 10.99.61.206 with SMTP id k197mr5425691pga.68.1494013815204; Fri, 05 May 2017 12:50:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c5si2571475pga.119.2017.05.05.12.50.12; Fri, 05 May 2017 12:50:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755958AbdEETuK (ORCPT + 6 others); Fri, 5 May 2017 15:50:10 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:51381 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755862AbdEETst (ORCPT ); Fri, 5 May 2017 15:48:49 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LwAO6-1e7mvv1EBa-0181mV; Fri, 05 May 2017 21:48:33 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Juergen Gross , David Vrabel , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 71/87] x86/xen: fix upper bound of pmd loop in xen_cleanhighmap() Date: Fri, 5 May 2017 21:47:29 +0200 Message-Id: <20170505194745.3627137-72-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:SaYuZXCOTN1gFmbC4MZsEUiCEF6l6VRjl9yJzVw9BWt+qR3KGk4 +GNYbK4+VOET/Mf4fJYUp/MznmIvoZNnFgxhwcIhBquIWOg6qBjRYBakdh+bJyWHmVe4iLs SqXtmTP1fk7/YM4DnOlj3kkLvFSk7hxgYHoWQPbPCOmIijGtSOR7/AWwnTImZtU8w8rh6KD wFuILdUw7kNNByKlddtpA== X-UI-Out-Filterresults: notjunk:1; V01:K0:rfqi6Hj6Su0=:aw8cM97Yl6v8353IlEiLzw yMTAL30tDvyItVord51KmE6jBgAZRxdgik5ZOdTEOHunFuN1sO2yEwQYIEkPQA4Dr1mpfJxcR 5nTrxHxBXxYskYl0DMmqfrIDC0Pc4ab6q5KHiHQVXE/9jKjsMcUwOiKw3gR7rUh5T+trQxGA7 Bv2k2I0Jgy9BhpsC/gSsDkJ70UDyKXlMCHnpQjJt5saekfMdOqw6SflmrKpeZDgFxMSn6Ncc8 JgccRHDuRhhOC9hNaAFT6aACMAmZz0XSP3dbm7uxYrbsCJZP8I0zOoYX1muLVXYgT1FaVYnKE W+7eI/7nL17+Cg6rXZKtghSip78XUkCsYEWz8x2BKY5ZW5aTS2FLaGl/kNLknI3Y+Rq38e8wP ZoyDY1m8qe4KQFlvsZ4unQEfwuQVnXN75VHC5p+M22rGyFGq3Dkyqa87O7ke36M7pAGOjXdbK 5XgDx6jos3BPhSPhCBM9tnBpHaUyiPAb7CURyGAAIyhSZLYyBsRrrSEcWyQ/Gzg12+au7VW1l nTvJHR44xe7g8JGI+TT/Hmw7JU2R1E+roJmjUwSRRbiIj1qi9vlCZ5BZmbhzgN9wMZzBkKPpq M1Lsi9GftJCK7tBgGwTkEeTrk/bGDoIwt9/CvDpCIoiJrRxKEZJyh2lgmbFLBrvHYh8CnH97V z+D06J39TWuqVuIYz3+unDc3vDaeP5z2vojR+VjBdOW4u8/np17PSYD78ajmzMBVcxCM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Juergen Gross commit 1cf38741308c64d08553602b3374fb39224eeb5a upstream. xen_cleanhighmap() is operating on level2_kernel_pgt only. The upper bound of the loop setting non-kernel-image entries to zero should not exceed the size of level2_kernel_pgt. Reported-by: Linus Torvalds Signed-off-by: Juergen Gross Signed-off-by: David Vrabel Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- arch/x86/xen/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 16fb0099b7f2..f05f2d897a67 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -1187,7 +1187,7 @@ static void __init xen_cleanhighmap(unsigned long vaddr, /* NOTE: The loop is more greedy than the cleanup_highmap variant. * We include the PMD passed in on _both_ boundaries. */ - for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt + PAGE_SIZE)); + for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt + PTRS_PER_PMD)); pmd++, vaddr += PMD_SIZE) { if (pmd_none(*pmd)) continue; From patchwork Fri May 5 19:47:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98699 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292886qge; Fri, 5 May 2017 12:48:47 -0700 (PDT) X-Received: by 10.99.124.75 with SMTP id l11mr5317580pgn.211.1494013727610; Fri, 05 May 2017 12:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013727; cv=none; d=google.com; s=arc-20160816; b=0mUoltaVESG5pvbPurIE75wHOOE85sQrDX6UjrNpj4kC0Oy0+jmkQ53elgcLjAW+sA ljuyIRAQzqLyoAUYhzlJKXbnxTWLtrflq0VXo02eXlyZKtDs2Z7kBRiKFiWGup2UcpnY w89Tn4ED89moylwB5cBOEFALCcNCu0wyyrMh86RsofFoN2EVBeFSlpMyTNz2yY0lglO1 +RfXXRHPzG1Iz1UvNrzzgx5AXy0i0I1JUCY38sdf7H4q4mL6IbltaGsqeih++dGpo6JH HWroB2orEj3cwWWrDvy/+geMC/4//KPFuWzeoIXNxyyQfMMtQQCSaU5cH2MmZQkm4Wi6 RVLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=JYCWZysKxGhvVGHv39m+ULOw/R/ym7A/BcoBLM428oc=; b=Dg45XY87b+bONblpFtlhz0k4mKQeb6sY/B9W4kijUWuSjmqRFjcieP3LB/70qlIKqI 9UDUYjuTrelR55f7Jn0krsiPMfH3lgYltyaVcDKILzQHGXtBdaRVRXEfa3hM3KDBjkq1 T8XXXZjwUTCKVidZW8j1PeEXO0wStKSD2hwQ1M9K3cvo8TiyIuu6rtyp8X0mw7BEPWN/ ht/Yz3BL64v71w6NzJdSiOWZD3n9Fp8uBC7e5JSdFErZzA8PFiuIbtnGI0GDt5O7hbLb w++TCQPcrMGhm8xXU/WshZUaglYB8YXhXa7075Qi+EkiHDxka01mLSkIdnS/7ogtFpDI 7nzQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.47; Fri, 05 May 2017 12:48:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755831AbdEETsp (ORCPT + 6 others); Fri, 5 May 2017 15:48:45 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:64882 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755624AbdEETsf (ORCPT ); Fri, 5 May 2017 15:48:35 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ma9tP-1dLmjG3gmV-00Lkfa; Fri, 05 May 2017 21:48:33 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 73/87] ARM: cns3xxx: shut up frame size warning Date: Fri, 5 May 2017 21:47:31 +0200 Message-Id: <20170505194745.3627137-74-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:RZ00IrusdY/YNBCUImII6BOJCbzne8UOwXIAANGljF9BsCX+3o4 lVf+HoS2IIzSLtL4RJuBXr0a45jZV+ySZRGIrsiXLn453J5OF2LsfxyRyqSY+DPxnyFUKIl H4+s2o7gNWhGrtk7A9BBKmLb8jS7U7mXh8qCXCkGLE5jORgvrsjUsPxWItdnhZbE9BBctGq 5QJL3VMskwfq2hkePRoCQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:vYiWvD45U1U=:hVZKmY+dz90QVuGoSwlV0c iXGyn8z/C7i2JNrTQwJC1ksDpxjtz+xRAOiZe20OHzUkYBdxJeqr30N1tKq7UHTsMZw+lm9vs UgRvusAv6uGjngQyKMGBBYNykeDu+iOoAXIxNtBgyV9WVGWEb3T1VY/LaonjxMVZkR90Ju0yg xRp+Zx+9/Zi/QLHmFJysx+5/VOTvARd+rIZFyFoSCgFZMLxhue570WaPkZ2Cckp/Sv2m8nTXL AvBKR/psxONf/T8ltu5De1V+MyaKdZwDkk0nmcL344fga9U7+LGZeGCVWJNDhEN7nG1+rg0ik gFB9ONCVQmBe62htecvRwOeMGfBdfZRmIhQk/k3xVByAOdBKd4z8WGJKX1XIK4dKowkJJHqFy F5efivfXbF92HHM8hkLqJ1WZMX2io1PIk6nhznY96nBO37x7kNKXW7EHbiGPo85EF7NS4pEsJ xci5jcAmHIghqoH5DSI0hl3T6utRtBUx5id9GRqhIra3iWHNaG/dwWqAK6AVoZSdbruI3AS09 mIQI08chSfKqaH1owG4QNJ+atBR/q/mawe16/2irWpda0nGDNIFbrMWpt5R5UZdrd5KlAxLhd KQKNiBFXe5Rj/NKkBExNJlNgOi5iDzPhL5DFoTCn6wfP+ffdpbHKnkXHdGGP3SagBkffO1PTQ HhV8KTLdZUI3FHU+zEZzIXhoqJAutI8sMMVwx/5Je+AmuUBtXdBjW3PqkFu7NkdmUBiQ= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This shuts up a warning in the 3.18-stable series that has been fixed in newer kernels with commit 498a92d42596 ("ARM: cns3xxx: pci: avoid potential stack overflow"): arch/arm/mach-cns3xxx/pcie.c: In function 'cns3xxx_pcie_hw_init': arch/arm/mach-cns3xxx/pcie.c:313:1: error: the frame size of 1080 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] The fix that went into v4.4 is known to be buggy and was later fixed again with commit 88e9da9a2a70 ("CNS3xxx: Fix PCI cns3xxx_write_config()"). While we could backport both to 3.18, they are fairly invasive and the warning is definitely harmless here as the call chain is known to not overflow the stack of the init task. This simply adds a Makefile flag to extend the limit for this one file. Signed-off-by: Arnd Bergmann --- We do want 88e9da9a2a70 ("CNS3xxx: Fix PCI cns3xxx_write_config()") backported into v4.4 though. --- arch/arm/mach-cns3xxx/Makefile | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/arch/arm/mach-cns3xxx/Makefile b/arch/arm/mach-cns3xxx/Makefile index a1ff10848698..fd610561616e 100644 --- a/arch/arm/mach-cns3xxx/Makefile +++ b/arch/arm/mach-cns3xxx/Makefile @@ -2,4 +2,5 @@ obj-$(CONFIG_ARCH_CNS3XXX) += cns3xxx.o cns3xxx-y += core.o pm.o cns3xxx-$(CONFIG_ATAGS) += devices.o cns3xxx-$(CONFIG_PCI) += pcie.o +CFLAGS_pcie.o += -Wframe-larger-than=1536 # override default 1024, this is safe here cns3xxx-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o From patchwork Fri May 5 19:47:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98700 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292901qge; Fri, 5 May 2017 12:48:49 -0700 (PDT) X-Received: by 10.98.204.87 with SMTP id a84mr15407502pfg.6.1494013729763; Fri, 05 May 2017 12:48:49 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.49; Fri, 05 May 2017 12:48:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755858AbdEETss (ORCPT + 6 others); Fri, 5 May 2017 15:48:48 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:64319 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755673AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MR7U6-1dULS01qNK-00UJF5; Fri, 05 May 2017 21:48:34 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Stefan Agner , Russell King , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 74/87] ARM: 8383/1: nommu: avoid deprecated source register on mov Date: Fri, 5 May 2017 21:47:32 +0200 Message-Id: <20170505194745.3627137-75-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:DJKJVUSH71nx341X21WquTlsU2pGPTH4sYm7c974MLPhbQ0+xHq dyybZbgPdS1j0sHEu6tphtij54S/xKWtwOH6H/EeMkyKrX5aNgKR18wyK1dvnJ+ZCIcGYhD aqwcf8RSpBU1nWXhfIPYibTsNFHk72zagn05UW8uvtbeQ32UtVHDQt4qJl5+D2awzSKN0NB /VrcDX4/ttIFgYxYLKBcA== X-UI-Out-Filterresults: notjunk:1; V01:K0:rS6+G1225ww=:/HC6NMkgSxWoORJxvRlUpY lhnGoIckQZ24dGacRJfiiPczuf079SNU7IUcuZM/8OzQyiaCuvnmi6e0zMxNWJnijuOI2fHQ7 NCWfuAd4LHK+1yh/FtCwJQUBn8erq1H//mlsNPkOF9IJvIS+zKMXReDMNCApI6mfAuDBjTLy8 OOWuDdWZEJgJfT+m5tLY/ZH+UR8ba5panLBM9Y8Y8dfJqmZLP3o1lQ8oFKtUfrEFesAzZSvPd 1K329aaT8aaSe4SqidLYZ/9giy1a4iRh3TR04zyyPvtbOtXKiflfQ1SZYZieNpF7OW184EWqI BFkERzKZUYtJ8fTT4jFhHAN046qQn9PynR2hGQAlixH/e8D76Aklis8RZzrq2lY7jIBXzZ58a MIaNeULa2ek/QNtVf2TCJ7MbcG9Q6bNYDE0pXxAocfODT16Vl/ERM5C4oRK2w2viuHLVJZciF czyA/80/lDT4F0rcoOKZklrLTyIO7oidF/zBUTKnSVRqjQ9yyYk1H56wu0ET15/z0Jj2G+AlT JPcrXRBIsu/mrBxba0FgCBizDGRjDnn22QcFGXPEmiM9tbEVbhLbcnS2qPz0mDPTUU2cuNcJO MaDDdt/sEQWdIUH96Zfvh5PTp730E20FX/rw302XNZL/wtYQyyjxOPSpu7J4GKCDTzCn3TsfW 6DTpoqhOz/QfDTy3XaesA0gfJLFR1zbH8AxrYjNZnvBBq6PZutZBBy6pEchCr/uTqJfo= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stefan Agner commit 970d96f9a81b0dd83ddd8bce0e5e1ba31881c5f5 upstream. In Thumb2 mode, the stack register r13 is deprecated if the destination register is the program counter (r15). Similar to head.S, head-nommu.S uses r13 to store the return address used after configuring the CPU's CP15 register. However, since we do not enable a MMU, there will be no address switch and it is possible to use branch with link instruction to call __after_proc_init. Avoid using r13 completely by using bl to call __after_proc_init and get rid of __secondary_switched. Beside removing unnecessary complexity, this also fixes a compiler warning when compiling a !MMU kernel: Warning: Use of r13 as a source register is deprecated when r15 is the destination register. Tested-by: Maxime Coquelin Signed-off-by: Stefan Agner Signed-off-by: Russell King Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- arch/arm/kernel/head-nommu.S | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) -- 2.9.0 diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index 716249cc2ee1..db0c82f4a99b 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S @@ -77,13 +77,12 @@ ENTRY(stext) orr r6, r6, #(1 << MPU_RSR_EN) @ Set region enabled bit bl __setup_mpu #endif - ldr r13, =__mmap_switched @ address to jump to after - @ initialising sctlr adr lr, BSYM(1f) @ return (PIC) address ARM( add pc, r10, #PROCINFO_INITFUNC ) THUMB( add r12, r10, #PROCINFO_INITFUNC ) THUMB( mov pc, r12 ) - 1: b __after_proc_init +1: bl __after_proc_init + b __mmap_switched ENDPROC(stext) #ifdef CONFIG_SMP @@ -106,8 +105,7 @@ ENTRY(secondary_startup) movs r10, r5 @ invalid processor? beq __error_p @ yes, error 'p' - adr r4, __secondary_data - ldmia r4, {r7, r12} + ldr r7, __secondary_data #ifdef CONFIG_ARM_MPU /* Use MPU region info supplied by __cpu_up */ @@ -115,23 +113,19 @@ ENTRY(secondary_startup) bl __setup_mpu @ Initialize the MPU #endif - adr lr, BSYM(__after_proc_init) @ return address - mov r13, r12 @ __secondary_switched address + adr lr, BSYM(1f) @ return (PIC) address ARM( add pc, r10, #PROCINFO_INITFUNC ) THUMB( add r12, r10, #PROCINFO_INITFUNC ) THUMB( mov pc, r12 ) -ENDPROC(secondary_startup) - -ENTRY(__secondary_switched) +1: bl __after_proc_init ldr sp, [r7, #8] @ set up the stack pointer mov fp, #0 b secondary_start_kernel -ENDPROC(__secondary_switched) +ENDPROC(secondary_startup) .type __secondary_data, %object __secondary_data: .long secondary_data - .long __secondary_switched #endif /* CONFIG_SMP */ /* @@ -164,7 +158,11 @@ __after_proc_init: #endif mcr p15, 0, r0, c1, c0, 0 @ write control reg #endif /* CONFIG_CPU_CP15 */ +<<<<<<< HEAD mov pc, r13 +======= + ret lr +>>>>>>> 12ebe5ca67dc... ARM: 8383/1: nommu: avoid deprecated source register on mov ENDPROC(__after_proc_init) .ltorg From patchwork Fri May 5 19:47:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98719 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293328qge; Fri, 5 May 2017 12:49:56 -0700 (PDT) X-Received: by 10.98.30.3 with SMTP id e3mr18579714pfe.48.1494013796795; Fri, 05 May 2017 12:49:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si2689373pgp.198.2017.05.05.12.49.56; Fri, 05 May 2017 12:49:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755720AbdEETs4 (ORCPT + 6 others); Fri, 5 May 2017 15:48:56 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:50371 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755767AbdEETsm (ORCPT ); Fri, 5 May 2017 15:48:42 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M1eYM-1dvfya2xnG-00tiRb; Fri, 05 May 2017 21:48:34 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Ard Biesheuvel , Russell King , Arnd Bergmann Subject: [PATCH 3.16-stable 75/87] ARM: 8221/1: PJ4: allow building in Thumb-2 mode Date: Fri, 5 May 2017 21:47:33 +0200 Message-Id: <20170505194745.3627137-76-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:ASb8VqWIVrWJVTNIv6eve4o5vJg0m5l8A1hLacBnhcIz6L/k5Zs up9VwKnXTNG8hGZzQFoVpcvoQZzf8PkFjeLDNBkl4LQG3TexCe3fqD78qNdxCrbk3L0H2bm cEHhXujk3fMa6Pmf0Fs2vUM1pAhYHk7fofjfM7oohMkxZ3TqoVghr6o/Dh0rrMtpc12E+MW 9Jpce88Ti/t2fUngqS2JA== X-UI-Out-Filterresults: notjunk:1; V01:K0:VifYnS3kBBU=:+k/rrC8gmiotqKAQygWL4K 1b89L6qMM0ltQAbsp0G5IPeZaho1zKyULFxBRv7g+eWKjBw0CXDk7rMKl16Vo4cLmgygsC8TO WNjWD1faZVI38/2ryhHico/jLR6nGqXKoAlkruc0uj/dCB0xIRYTw46LRTcZkPeoZIrdN7xPx MGKmAu2QMRwG1rSjdz6H/um03qv1sKAsgks+hSwXM0RJRZvBJuEvuFHNxgf6tuRpQIIThJuG4 jKoidXxvL/vpBbcgKS4ugvOhBa0CtRZ8lV9X9glD9vNdbOVX1Fcd27BVKRMeSvvE/bpnjMRuz imvVuLMjyZ89D5fVZ4rAuNenjJTHGZea7+4BHr5kR/psdTomDgQIWkoKTlsM0E0rks6ayoIu0 IGE+S1cdKnkYTdU+NGIM+UFIBUBVEvb7jgutRAorXsdTu5JK5FMgjDhL6zZhKbdT+UxTah6jl HBgY4nuyfuLvEQnmAGfP7PPwa4vyGBoLzLT6EahWFduvfYsnuJVaksaW8CsEUkQ6j71P1CfZA UULCo/M2vxYQzg4Y2UTZ5Sh8IgOMcL7D0y/iLcC9gfySYtHdKEvjW22Ol6HypMpbUJKNLy25J tXh1aYrrMS0ECsZvHs+BZ2nSocVNB5VQLsEbnCIXDv+A5Xvum8CT+uCwZLzu+7slzL531ks4g pBvVsHIbHbjOym71mIdtpRTqDlqtClrjs/wV2JAh8Ewe0YwCR+Jcp15cnnsX4/fl1914= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ard Biesheuvel Commit 69bbf2ab20389418327484288d8730732e4f3dd0 upstream. Two files that get included when building the multi_v7_defconfig target fail to build when selecting THUMB2_KERNEL for this configuration. In both cases, we can just build the file as ARM code, as none of its symbols are exported to modules, so there are no interworking concerns. In the iwmmxt.S case, add ENDPROC() declarations so the symbols are annotated as functions, resulting in the linker to emit the appropriate mode switches. Acked-by: Nicolas Pitre Tested-by: Olof Johansson Signed-off-by: Ard Biesheuvel Signed-off-by: Russell King Signed-off-by: Arnd Bergmann --- arch/arm/kernel/Makefile | 1 + arch/arm/kernel/iwmmxt.S | 13 +++++++++++++ 2 files changed, 14 insertions(+) -- 2.9.0 diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 03120e656aea..2ecc7d15bc09 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -84,6 +84,7 @@ obj-$(CONFIG_CPU_PJ4B) += pj4-cp0.o obj-$(CONFIG_IWMMXT) += iwmmxt.o obj-$(CONFIG_PERF_EVENTS) += perf_regs.o obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o +CFLAGS_pj4-cp0.o := -marm AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S index 2b32978ae905..d65bb940d797 100644 --- a/arch/arm/kernel/iwmmxt.S +++ b/arch/arm/kernel/iwmmxt.S @@ -58,6 +58,7 @@ #define MMX_SIZE (0x98) .text + .arm /* * Lazy switching of Concan coprocessor context @@ -182,6 +183,8 @@ concan_load: tmcr wCon, r2 mov pc, lr +ENDPROC(iwmmxt_task_enable) + /* * Back up Concan regs to save area and disable access to them * (mainly for gdb or sleep mode usage) @@ -232,6 +235,8 @@ ENTRY(iwmmxt_task_disable) 1: msr cpsr_c, ip @ restore interrupt mode ldmfd sp!, {r4, pc} +ENDPROC(iwmmxt_task_disable) + /* * Copy Concan state to given memory address * @@ -268,6 +273,8 @@ ENTRY(iwmmxt_task_copy) msr cpsr_c, ip @ restore interrupt mode mov pc, r3 +ENDPROC(iwmmxt_task_copy) + /* * Restore Concan state from given memory address * @@ -304,6 +311,8 @@ ENTRY(iwmmxt_task_restore) msr cpsr_c, ip @ restore interrupt mode mov pc, r3 +ENDPROC(iwmmxt_task_restore) + /* * Concan handling on task switch * @@ -335,6 +344,8 @@ ENTRY(iwmmxt_task_switch) mrc p15, 0, r1, c2, c0, 0 sub pc, lr, r1, lsr #32 @ cpwait and return +ENDPROC(iwmmxt_task_switch) + /* * Remove Concan ownership of given task * @@ -353,6 +364,8 @@ ENTRY(iwmmxt_task_release) msr cpsr_c, r2 @ restore interrupts mov pc, lr +ENDPROC(iwmmxt_task_release) + .data concan_owner: .word 0 From patchwork Fri May 5 19:47:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98703 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292919qge; Fri, 5 May 2017 12:48:52 -0700 (PDT) X-Received: by 10.84.254.67 with SMTP id a3mr67402041pln.185.1494013732476; Fri, 05 May 2017 12:48:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.52; Fri, 05 May 2017 12:48:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755483AbdEETsv (ORCPT + 6 others); Fri, 5 May 2017 15:48:51 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:61012 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755674AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ljz90-1de95l0ND8-00cBap; Fri, 05 May 2017 21:48:35 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Tony Lindgren , Arnd Bergmann Subject: [PATCH 3.16-stable 76/87] ARM: OMAP: Fix Kconfig warning for omap1 Date: Fri, 5 May 2017 21:47:34 +0200 Message-Id: <20170505194745.3627137-77-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:XxYNck30pq0xtttV+FMvveVcaW1jDpCO+9BFVyLgMh/EBboHoCV Gd+c3TeDZlP9ppiWGOF7OUX2Q+mgj7dftCsaGY8P5PVDGsQVkaAHpm9+TVgxph4Hwt/XQJs jZWurB1KIePyIUPJWMPC9gLMrlWZJ5wYsShNgLMQxIZWFYPOCc53QOR2FAmqpEDZPjzE2h9 I5Nz1dEIrKc42nUVmVCXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:cXFLC5F2VG4=:cLBaQ+8XWW1PiSO8gM54Jo gR6WGaT+FmiK71/JI6fc4Y4D3SofdNLS8jT65wGw6ZLm1IinE24EONTL0sYMCsBSDe1njLs3v v3Ky3/3Ad0tUV/uldu4szSAYWaEIKrAxeRT00KLsW5cjDtuCXkKs1bzNLLs8JmpDXC8NsrPFR A/0yH9zkXk04/X4rxc1eq4W6UsJIv1riy4XjZwogy0ZW2U1Wog0WKYNTOu73+yXWzd5NnXfzy VEoK+8+3kprBBhd97FUKRe9nFJqG+YBxyIwTWclSgECK5mlHhjstvDKRod5XxdPWtBMz4g3AB hRIWA0Q0qI6dhefeReHy/n6d6rzFzBqhRZMdOmcwMNCTee45gOCEWIhX/RW8VZ7CsnamflAYd J0H6W/vw+ZRiJ7zKVQzq5UkI2CotSpG9OlOX3hOuPqvNo1tQKsmX6zgh35UoxHXJq79xI3dfj xua2r2zEfsV5K+PZZS2LxXmD1rUMEIe1wI2z5iqnBHgxR5AECwEm1I6+EgjzYXVc++cf7d2h4 KNQ6McXNOhxyWD5DPd7zyABepmIRvQdgzlEbCEacTn4hF3dzb3yye8zzI+QF+N4sNKWjU+Suo qzIpjglrHZxmibnpoqGLgU83axxhJ38aSt8Sr670Yvp3cXu08dobu0nNPmDnVjM0x608W41Sx pr9qAibSDKXTVLeuPr31OG+9a8e3GrIqEBeRmi/V42Y1z8vw1BodDtruo3o6ZI3GjxHU= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tony Lindgren Commit f311f63369ac04993e69e36c7a1913cbf9f470ee upstream. Commit 21278aeafbfa ("ARM: use menuconfig for sub-arch menus") improved the sub-arch menus, but accidentally caused new warnings for omap1. This was because the commit added a menu entry around config ARCH_OMAP bool entry where the menu had depends on ARCH_MULTI_V6 || ARCH_MULTI_V7. As ARCH_OMAP is shared between omap1 and omap2plus, let's fix the issue by defining ARCH_OMAP in the shared plat-omap/Kconfig. Fixes: 21278aeafbfa ("ARM: use menuconfig for sub-arch menus") Reported-by: Andreas Ruprecht Signed-off-by: Tony Lindgren Signed-off-by: Arnd Bergmann --- arch/arm/mach-omap2/Kconfig | 3 --- arch/arm/plat-omap/Kconfig | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 1c1ed737f7ab..3ac9cb2b2eb2 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -1,9 +1,6 @@ menu "TI OMAP/AM/DM/DRA Family" depends on ARCH_MULTI_V6 || ARCH_MULTI_V7 -config ARCH_OMAP - bool - config ARCH_OMAP2 bool "TI OMAP2" depends on ARCH_MULTI_V6 diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 02fc10d2d63b..d055db32ffcb 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -1,3 +1,6 @@ +config ARCH_OMAP + bool + if ARCH_OMAP menu "TI OMAP Common Features" From patchwork Fri May 5 19:47:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98716 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293235qge; Fri, 5 May 2017 12:49:41 -0700 (PDT) X-Received: by 10.84.238.199 with SMTP id l7mr38047439pln.153.1494013781024; Fri, 05 May 2017 12:49:41 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y32si6309907plh.238.2017.05.05.12.49.40; Fri, 05 May 2017 12:49:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755945AbdEETs5 (ORCPT + 6 others); Fri, 5 May 2017 15:48:57 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:65158 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755606AbdEETsn (ORCPT ); Fri, 5 May 2017 15:48:43 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MZsuU-1dLVkL1Ob0-00LTYR; Fri, 05 May 2017 21:48:35 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Russell King , Arnd Bergmann Subject: [PATCH 3.16-stable 77/87] ARM: 8160/1: drop warning about return_address not using unwind tables Date: Fri, 5 May 2017 21:47:35 +0200 Message-Id: <20170505194745.3627137-78-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:NC4o2fRFtRnqK6M1SPT68iH0yJJWmkIKzFVTlG5Xzs+cLcuiWNa WtZSHg4B8qGk2U6PrimMa9J45xZx7PBrTub1Zw7XI+rXFKZygudGVQxwPQ/4VrLSGgfdkLa 0iwdTXKb+EZRYyh/+rz/av5TUL9l3A9OYXGQwwhn07nKsMP6a50HWOD3w1IymeVQmIh1HVB SZ08HnoGp1alkSu3HEOhA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Ua4r49ktZEg=:pZTr9IiwKrBYgYC6j/0Pz0 qy3fm6W1ae2gmbYG56k2TyUfn0pNNxBYQOtOz/54ejI9gm2WLC3oCjY0jJnzD+phgdZz6CL8I Lwlb29pa8v9IYitWSE9QFfqf3OPitGMnUHYnL8PSXvBm2Mzi93wwSAfcIwgj367tJYa7DVWE6 G8uhBZI2wdw+sPQzKUOxnGZWukmMIvv5cRP0wuWVSEtbmu0em4GB4bxMa1Po78/KWbJdgysXE bjWXvIJ3tSi/Ql2CEmzLr/jXboboUkCLA5SM2AeDw5ppI4hf2mYueL9oCj7vSU09o0lm86YPY RNrHrZns5su+EMYhHuG872vWsSlOPUB2SU8k7farVGc1ONCl+dIwfGRU3Hb/ey6i+N4gKJ2Hh VZ5ykPwsJtlWwJLhVByPtRcbucoFEOneDr6TS11cTJM6vz4Cm4HI0+Rn72Q9JieAB59PdKZia mrl3ZPo7Pr9Hh1zn4ogfkh/rehZ/lvrhimDLXWvtPDFF9zsb8rOclc2bDy9+SJVhfdF29UpFQ 5g1t6O0o6ahMqpP6hT8g1yzPbHknVbmD8UvArieFVzUNI0yFSSdVkRnd4dvoUj/JjMDMLXZhB IF9PkVYmVXDDKn/21B7F6Rj+FwGZnFfz+Loeq+bzK6WkLWYIQ8P1kumw8u/d2vClaQOuLiv0W WtkKdm39EbuG9Yhx925c9PrJfkhY+aAd/NTsSEGqv/GNqxcEEQx9H/dFqsRtYJPS6IvBqSn0q UzZTBdVeaHlXykat Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Uwe Kleine-König Commit e16343c47e4276f5ebc77ca16feb5e50ca1918f9 upstream. The warning was introduced in 2009 (commit 4bf1fa5a34aa ([ARM] 5613/1: implement CALLER_ADDRESSx)). The only "problem" here is that CALLER_ADDRESSx for x > 1 returns NULL which doesn't do much harm. The drawback of implementing a fix (i.e. use unwind tables to implement CALLER_ADDRESSx) is that much of the unwinder code would need to be marked as not traceable. Signed-off-by: Uwe Kleine-König Signed-off-by: Russell King Signed-off-by: Arnd Bergmann --- arch/arm/kernel/return_address.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.9.0 diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c index fafedd86885d..827d946d2be4 100644 --- a/arch/arm/kernel/return_address.c +++ b/arch/arm/kernel/return_address.c @@ -59,10 +59,6 @@ void *return_address(unsigned int level) #else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */ -#if defined(CONFIG_ARM_UNWIND) -#warning "TODO: return_address should use unwind tables" -#endif - void *return_address(unsigned int level) { return NULL; From patchwork Fri May 5 19:47:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98718 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293323qge; Fri, 5 May 2017 12:49:55 -0700 (PDT) X-Received: by 10.98.97.195 with SMTP id v186mr18953783pfb.81.1494013795808; Fri, 05 May 2017 12:49:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si2689373pgp.198.2017.05.05.12.49.55; Fri, 05 May 2017 12:49:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755767AbdEETs5 (ORCPT + 6 others); Fri, 5 May 2017 15:48:57 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:50742 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753654AbdEETsm (ORCPT ); Fri, 5 May 2017 15:48:42 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lsc93-1e4EhO2VIX-012H12; Fri, 05 May 2017 21:48:35 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Russell King Subject: [PATCH 3.16-stable 78/87] ARM: 8296/1: cache-l2x0: clean up aurora cache handling Date: Fri, 5 May 2017 21:47:36 +0200 Message-Id: <20170505194745.3627137-79-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:8+Q926C+9XIKYfeMXtk4GszX0xGf+/oMalbWrjUKX2OcPJVkzOo vhIXzbBe0w1jp4Ffc4Dfu7587ToQQ9/sOw/hmP/mpOnVQo/lwORx3UdBiTAmLsyfTKh2qlW qJtfZ9F9mtOZGOv9V0hTzDJQB8l7nlsa61Y9aA4p1X3tr0ii0bpFDoUn3hsW8m3oOPYG7TD IMjn84Sw9D3AgkRnNtSXg== X-UI-Out-Filterresults: notjunk:1; V01:K0:oNeHURWFMjI=:J41B1Ku5PvMUDQmJJPzBp0 jbrEb8+ToFKJcBBan7Sh+1FYa7mVwuYI5jgNIZWTw9X2bjwMAtC8bPeKRlvmUGUDRmaZVPeNF QuTl3QUEnJLM11kk2ekyp368Mz6XcteFwR5AVX3Z5i/6YXu+ZPpXY+1wVbdsOVHMN8Oqw97R8 GsdCPt724PULnVlpptssOlMwI6mFBIip1fWk6W/4bft4ElC1P45IT4H2sXT3ZfWTgiddEApb8 scIf/bquTCVaaj0rozASu1IVFk7Lr1e6jleLj/k8ytooEQpPvj4bLUW/aqUqqDg4J/Pbto8Y0 NcPHSCWqkgmNVMvPp2+BCHANqQk69ora3oR1AOCNMdaNrImPFx5+ALlDx+MlF0q08Y9JAFIgP TX6FglP3Bre4pHSzG0VrjI4VZnUCgdRM7ACcETFQyG4i+wmAiDpP9mkV2WGZmh79leq7LcNHi luCLZnplXCLlTLUsqk0GRwyr7wrkVBR3A7E6sm+jYSKD4UJVw/0yukeaVKe9k/s4OnOG9jZmp esoQPGVjys57/4y27N2icQIUoMRY/+66EB95j7WytPfS3m5lK/0Koq+PQraeb78AbUnATplmk I7/s81mT71fQ1/73yegIEczNe+y3lFCTHwBk86hDpJ5keF8GE0VTqPMo/ZI40sY3kwlmB7BJI ow3aQyHuFenxW6M48VFIqEVbJXThzd14LIt+AFEI4G1+9NJ9O7g2774/KkaLDtEGbbuU= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 20e783e39e55c2615fb61d1b3d139ee9edcf6772 upstream. The aurora cache controller is the only remaining user of a couple of functions in this file and are completely unused when that is disabled, leading to build warnings: arch/arm/mm/cache-l2x0.c:167:13: warning: 'l2x0_cache_sync' defined but not used [-Wunused-function] arch/arm/mm/cache-l2x0.c:184:13: warning: 'l2x0_flush_all' defined but not used [-Wunused-function] arch/arm/mm/cache-l2x0.c:194:13: warning: 'l2x0_disable' defined but not used [-Wunused-function] With the knowledge that the code is now aurora-specific, we can simplify it noticeably: - The pl310 errata workarounds are not needed on aurora and can be removed - As confirmed by Thomas Petazzoni from the data sheet, the cache_wait() macro is never needed. - No need to hold the lock across atomic cache sync - We can load the l2x0_base into a local variable across operations There should be no functional change in this patch, but readability and the generated object code improves, along with avoiding the warnings. (on Armada 370 RD and Armada XP GP, boot tested, plus a little bit of DMA traffic by reading data from a SD card) Acked-by: Thomas Petazzoni Tested-by: Thomas Petazzoni Signed-off-by: Arnd Bergmann Signed-off-by: Russell King --- arch/arm/mm/cache-l2x0.c | 111 ++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 73 deletions(-) -- 2.9.0 diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 7c3fb41a462e..011490e7204d 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -135,73 +135,6 @@ static void l2c_disable(void) dsb(st); } -#ifdef CONFIG_CACHE_PL310 -static inline void cache_wait(void __iomem *reg, unsigned long mask) -{ - /* cache operations by line are atomic on PL310 */ -} -#else -#define cache_wait l2c_wait_mask -#endif - -static inline void cache_sync(void) -{ - void __iomem *base = l2x0_base; - - writel_relaxed(0, base + sync_reg_offset); - cache_wait(base + L2X0_CACHE_SYNC, 1); -} - -#if defined(CONFIG_PL310_ERRATA_588369) || defined(CONFIG_PL310_ERRATA_727915) -static inline void debug_writel(unsigned long val) -{ - l2c_set_debug(l2x0_base, val); -} -#else -/* Optimised out for non-errata case */ -static inline void debug_writel(unsigned long val) -{ -} -#endif - -static void l2x0_cache_sync(void) -{ - unsigned long flags; - - raw_spin_lock_irqsave(&l2x0_lock, flags); - cache_sync(); - raw_spin_unlock_irqrestore(&l2x0_lock, flags); -} - -static void __l2x0_flush_all(void) -{ - debug_writel(0x03); - __l2c_op_way(l2x0_base + L2X0_CLEAN_INV_WAY); - cache_sync(); - debug_writel(0x00); -} - -static void l2x0_flush_all(void) -{ - unsigned long flags; - - /* clean all ways */ - raw_spin_lock_irqsave(&l2x0_lock, flags); - __l2x0_flush_all(); - raw_spin_unlock_irqrestore(&l2x0_lock, flags); -} - -static void l2x0_disable(void) -{ - unsigned long flags; - - raw_spin_lock_irqsave(&l2x0_lock, flags); - __l2x0_flush_all(); - l2c_write_sec(0, l2x0_base, L2X0_CTRL); - dsb(st); - raw_spin_unlock_irqrestore(&l2x0_lock, flags); -} - static void l2c_save(void __iomem *base) { l2x0_saved_regs.aux_ctrl = readl_relaxed(l2x0_base + L2X0_AUX_CTRL); @@ -1126,14 +1059,15 @@ static unsigned long calc_range_end(unsigned long start, unsigned long end) static void aurora_pa_range(unsigned long start, unsigned long end, unsigned long offset) { + void __iomem *base = l2x0_base; unsigned long flags; raw_spin_lock_irqsave(&l2x0_lock, flags); - writel_relaxed(start, l2x0_base + AURORA_RANGE_BASE_ADDR_REG); - writel_relaxed(end, l2x0_base + offset); + writel_relaxed(start, base + AURORA_RANGE_BASE_ADDR_REG); + writel_relaxed(end, base + offset); raw_spin_unlock_irqrestore(&l2x0_lock, flags); - cache_sync(); + writel_relaxed(0, base + AURORA_SYNC_REG); } static void aurora_inv_range(unsigned long start, unsigned long end) @@ -1193,6 +1127,37 @@ static void aurora_flush_range(unsigned long start, unsigned long end) } } +static void aurora_flush_all(void) +{ + void __iomem *base = l2x0_base; + unsigned long flags; + + /* clean all ways */ + raw_spin_lock_irqsave(&l2x0_lock, flags); + __l2c_op_way(base + L2X0_CLEAN_INV_WAY); + raw_spin_unlock_irqrestore(&l2x0_lock, flags); + + writel_relaxed(0, base + AURORA_SYNC_REG); +} + +static void aurora_cache_sync(void) +{ + writel_relaxed(0, l2x0_base + AURORA_SYNC_REG); +} + +static void aurora_disable(void) +{ + void __iomem *base = l2x0_base; + unsigned long flags; + + raw_spin_lock_irqsave(&l2x0_lock, flags); + __l2c_op_way(base + L2X0_CLEAN_INV_WAY); + writel_relaxed(0, base + AURORA_SYNC_REG); + l2c_write_sec(0, base, L2X0_CTRL); + dsb(st); + raw_spin_unlock_irqrestore(&l2x0_lock, flags); +} + static void aurora_save(void __iomem *base) { l2x0_saved_regs.ctrl = readl_relaxed(base + L2X0_CTRL); @@ -1267,9 +1232,9 @@ static const struct l2c_init_data of_aurora_with_outer_data __initconst = { .inv_range = aurora_inv_range, .clean_range = aurora_clean_range, .flush_range = aurora_flush_range, - .flush_all = l2x0_flush_all, - .disable = l2x0_disable, - .sync = l2x0_cache_sync, + .flush_all = aurora_flush_all, + .disable = aurora_disable, + .sync = aurora_cache_sync, .resume = aurora_resume, }, }; From patchwork Fri May 5 19:47:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98723 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293428qge; Fri, 5 May 2017 12:50:06 -0700 (PDT) X-Received: by 10.98.10.147 with SMTP id 19mr18843421pfk.193.1494013805921; Fri, 05 May 2017 12:50:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013805; cv=none; d=google.com; s=arc-20160816; b=QgNRaTNIE/l5D50Yl2fw/mCoLbDzTjnm+tngbUdNqX4o2Pz3jCnaNDTXXNYJU6JtW1 gnfCrwoYlAul4bbHkzV19lH4G72ex0bTqr9WJTvz/7wy/AtZZhy8yAjmMUFqbzuEw4Kt DJ2wbdFjGNwIGmtzJSz/aacs2gdOJgowZJlhfrz8YMqNUJ0gB224KgExlaeDQbQPoFP/ rEzvYHyi6RN6vQXfk6q5c1fuL44aaD6KUv/NRi/1Bzho70XlGjg10sEcBhPaGOyJtXGz VpnGX8UCLT6zwauTUELIwMCC/VKqcoAHY3wB/ynalqRvALYsfaqijWzmUR20QgJl+jye U34w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=eGtrhXnRJL1184Kb2EkFmo55CIM0TwP2imhWfX/C+24=; b=HNi4Kok5rgv0BSEzOge0oZilL+O2M1EtzaCm8pE3/JEnsRh2mH5DODTfVgdLTFzDfJ yqucWB1hEYFzNPBGZk5kOa+ghW4n8NidDrkz0G22PIT5FWg0ywAQOI8opFfg3z3n/pER A+SZX9edXH1+l4162u6uNeWgRW8Z3GH+0zvRFMaSLlm+ASQpnueYdLn8pC/morBWr+Ol 3k0DRL7nStrSyPPqT6QlkzdBWIiR1qkL/7JdBb+cDfo1eCpKcGThF3vXOMi4VhqmVRqX T6kaAtZ9/37o7tIL4b+Nt0RkkgumYRP8Q4d5CCti+9YCfvvUHZPekKI3kQQnv2sJkaOf 9/8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c5si2571475pga.119.2017.05.05.12.50.05; Fri, 05 May 2017 12:50:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755901AbdEETt6 (ORCPT + 6 others); Fri, 5 May 2017 15:49:58 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:64545 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755830AbdEETsz (ORCPT ); Fri, 5 May 2017 15:48:55 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LzCmv-1eAoGg3kor-014Roa; Fri, 05 May 2017 21:48:36 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Andre Przywara , Will Deacon , Arnd Bergmann Subject: [PATCH 3.16-stable 79/87] arm64: add missing data types in smp_load_acquire/smp_store_release Date: Fri, 5 May 2017 21:47:37 +0200 Message-Id: <20170505194745.3627137-80-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:ORpT2n0zgX4KTw/9hZqvrMzBWiCXpP8HffQAEB0hcIqIb7gFdN8 aEdj2yjJPHT1yDI0Akak8b3dlhjKv5c1sQIoRPYQ3/AnLM2OP6IYfN4Rg17BNS/iCbdduMN Hsgrp5grRX7KvMhjZsPmc1luDvdu6aY4nuP206AsHM+PN/sBvSe0wCd3E07m9ShkEEQKGWd LYvEFC3LiJFCBWHRGuk2A== X-UI-Out-Filterresults: notjunk:1; V01:K0:UBfgnfqmCK0=:uIkjDKCs2HQ6dSW8sguBPq tBkpOIpu3B6CLSqNcn0TLbKI3Mpw6TJmFCDLYpA8XL8pFZk/+NrFYBZTYQi0g1QxxgwxrGjqx zWLfW3rvMrObC1/obynbOX2Hs4TKr1wsRPJCuC1P7KStx6BpZk9FCUCQJbDjz1Nxq12rmmoju npOOGjARdgFB0c9MXTTulnlbtehNWeQCWTcVtk8uQATiRPeTSOvoxx5ybKijT/7g+9H5Ph5Rf i07x8wjLqiOFzj/QILNeA9qMW8xL8NfVw1ndqqBAX5e1q2Bk3PH/2BjlPRstrA6Eh6oeWzNDu VkwfdJD61y584NN10XvVMM5bJcg1tGRwy4I2r1sZajJ2xzbk8OT/9uIfgKHDoof96WB2Mu28V e7gc6FshQ7htLEG+QiPWsnzyqCqrkxvIF96RZwQ9NQLICeNKsv/J/E1Rpn5qBm242dJD5UKKS 8AvaMyrnU2fZK9LexWGkHBETGNuwmqiy4RCE2AjSaoyEOdTXwp+dhWHvozRj48yIZyLJoHi89 SAtrOSaqt5yhyvv8zXjuFpllTgu8hC8m8+i9LowOkVYdCCMscYC01GrryNkk8YjjIXL6tqns0 t2jZSWa+IyIXk557y68XuUYSBkf2mny7fApjqhjVU418hRt77zpM3I9dIkU1y/+IpETtJyA12 HYpt8HoncAJosdpR18xaD0cyN4MaKgt7gSXEMmb1t8hNLLTbH/zG+KPIbdlQvOlQ0VLM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andre Przywara Commit 2427963027aea8d649b69a6956979cc875edfcf3 upstream. Commit 8053871d0f7f ("smp: Fix smp_call_function_single_async() locking") introduced a call to smp_load_acquire() with a u16 argument, but we only cared about u32 and u64 types in that function so far. This resulted in a compiler warning fortunately, pointing at an uninitialized use. Due to the implementation structure the compiler misses that bug in the smp_store_release(), though. Add the u16 and u8 variants using ldarh/stlrh and ldarb/stlrb, respectively. Together with the compiletime_assert_atomic_type() check this should cover all cases now. Acked-by: Will Deacon Signed-off-by: Andre Przywara Signed-off-by: Will Deacon Signed-off-by: Arnd Bergmann --- arch/arm64/include/asm/barrier.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.9.0 diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h index 6389d60574d9..45548e19c673 100644 --- a/arch/arm64/include/asm/barrier.h +++ b/arch/arm64/include/asm/barrier.h @@ -62,6 +62,14 @@ do { \ do { \ compiletime_assert_atomic_type(*p); \ switch (sizeof(*p)) { \ + case 1: \ + asm volatile ("stlrb %w1, %0" \ + : "=Q" (*p) : "r" (v) : "memory"); \ + break; \ + case 2: \ + asm volatile ("stlrh %w1, %0" \ + : "=Q" (*p) : "r" (v) : "memory"); \ + break; \ case 4: \ asm volatile ("stlr %w1, %0" \ : "=Q" (*p) : "r" (v) : "memory"); \ @@ -78,6 +86,14 @@ do { \ typeof(*p) ___p1; \ compiletime_assert_atomic_type(*p); \ switch (sizeof(*p)) { \ + case 1: \ + asm volatile ("ldarb %w0, %1" \ + : "=r" (___p1) : "Q" (*p) : "memory"); \ + break; \ + case 2: \ + asm volatile ("ldarh %w0, %1" \ + : "=r" (___p1) : "Q" (*p) : "memory"); \ + break; \ case 4: \ asm volatile ("ldar %w0, %1" \ : "=r" (___p1) : "Q" (*p) : "memory"); \ From patchwork Fri May 5 19:47:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98729 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293494qge; Fri, 5 May 2017 12:50:16 -0700 (PDT) X-Received: by 10.99.137.194 with SMTP id v185mr5310054pgd.206.1494013816569; Fri, 05 May 2017 12:50:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c5si2571475pga.119.2017.05.05.12.50.15; Fri, 05 May 2017 12:50:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755597AbdEETuL (ORCPT + 6 others); Fri, 5 May 2017 15:50:11 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:61315 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755839AbdEETsq (ORCPT ); Fri, 5 May 2017 15:48:46 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LjRBA-1ddb802fSi-00bdMT; Fri, 05 May 2017 21:48:36 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Kevin Cernekee , f.fainelli@gmail.com, mbizon@freebox.fr, jogo@openwrt.org, jfraser@broadcom.com, linux-mips@linux-mips.org, devicetree@vger.kernel.org, Ralf Baechle , Arnd Bergmann Subject: [PATCH 3.16-stable 80/87] MIPS: BMIPS: Fix ".previous without corresponding .section" warnings Date: Fri, 5 May 2017 21:47:38 +0200 Message-Id: <20170505194745.3627137-81-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:VsRBo37U/oOBTBW0jRmChixgFspWYwCxjtDWzpycxB52OI7PQY9 dsXZg3t3Eopd1anWbfsIcdnQTqsoI0nSyaHqtDjv53pjglup5lD/Hbp+bLn3aHyJ7y4tolo ztXSfmlP13TvnHlgPpIGO+HulohnVDKRS0uwJQtVyZP68Q1X370ycjryHd7VnVxtHFhx2cP DoZzmOMhUIuJIO8pqcpEw== X-UI-Out-Filterresults: notjunk:1; V01:K0:zMuUmplpWWA=:qZliwT+QJQcIzLgYhfk1tu faf9VcWagaDWq9kSsWHg3JHpWfmInD8+DtnJYzo/cmakdvta7CAVCIqeHsuVMxI0jvTLeYPWN W4OU9FiIefiTO5VssavbOb94klykbs/k2U22eM0cXGRWFZZknItpXFPlPtAOk2ULJ23J0/TXb TYF7HFvKUB6ekiXUF6DhuUtJJKONaamBo6+cB69/CUAAmLsW0YzE/4v0WKtRj1t+Ovra/INm/ F7Y4hi0UFWJjDZzpIqql4jJComYz7hvj4XjusKpbnWVpRSJ8Vji3Ns2ZmszYuwsH/Te3AsB2X 1JFvzJ+s1++8Y0PmSOQq+3Tg9YyrIttPWmhQTgPWfkz10RD4j78djkaNVw7Vh+f1Yn4PykJAX Sc4jLeZ5mSMyT2B3PBfYWnkH2ugOT/r936o0I5RCQ/RCbRhtkGU5PucAmX7CoBONI3R1zSvcy PHsthCwehMNOmDWtSHb/PjZvFm7yRc8HIrZu52/Kj1u11XzE2rsnQoKSJxe2Z/XGxR058Gs1G yrw+yfUjp149vu7RPOYhWex2y4mEj/ISeb6i7qvDAz/45M6NKysmIiSI5+30c1SBvT5t/z8XG JGyiTNIlpOXCBKq1+rYkWSpFilrMXbZCGUkVObE8nztE0TtXiFbUETJejiBUntj/+XkHOUkja VvW+sAg4/qtwOgt5mEC75FPaELVbWx/4JuANjWmQ1oSx4JqjRfAnf2wDvZWM+iwg5PS4= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kevin Cernekee Commit dd9e0165f1edf9c5af0ceeabae592f9911a1569d upstream. Commit 078a55fc824c1 ("Delete __cpuinit/__CPUINIT usage from MIPS code") removed our __CPUINIT directives, so now the ".previous" directives are superfluous. Remove them. Signed-off-by: Kevin Cernekee Cc: f.fainelli@gmail.com Cc: mbizon@freebox.fr Cc: jogo@openwrt.org Cc: jfraser@broadcom.com Cc: linux-mips@linux-mips.org Cc: devicetree@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/8156/ Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/kernel/bmips_vec.S | 3 --- 1 file changed, 3 deletions(-) -- 2.9.0 diff --git a/arch/mips/kernel/bmips_vec.S b/arch/mips/kernel/bmips_vec.S index d4614d31d828..d9495f3f3fad 100644 --- a/arch/mips/kernel/bmips_vec.S +++ b/arch/mips/kernel/bmips_vec.S @@ -211,7 +211,6 @@ bmips_reset_nmi_vec_end: END(bmips_reset_nmi_vec) .set pop - .previous /*********************************************************************** * CPU1 warm restart vector (used for second and subsequent boots). @@ -286,5 +285,3 @@ LEAF(bmips_enable_xks01) jr ra END(bmips_enable_xks01) - - .previous From patchwork Fri May 5 19:47:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98724 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293431qge; Fri, 5 May 2017 12:50:06 -0700 (PDT) X-Received: by 10.98.46.69 with SMTP id u66mr18930261pfu.262.1494013806213; Fri, 05 May 2017 12:50:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013806; cv=none; d=google.com; s=arc-20160816; b=0/Rsf4Qr0vJOGFV1TEfYAbQX9nuVJl70UZEMcyXgOOfSrZCKGng2zZtuy4mfXtZoPc Bktrcxflzf88hTXFFsE64niNRE0GUNNOLkxLlWIvpRcs1u/IWMRrT79pw6gGoROAvwG6 BNhpIG/OhT+T6kL2IACVys7h38ORgHQP2XxCjKI5+IzD/FfeiYHEq+KiKUfInsNdm/tX NQTcrXk0CVOC/uH2tkr83b9AHpemk1d9WmkI8s+AfdEXqbjYfZnh0GGA92fKCeMly6EV 8YxSK/NDu+2Y7Zz69tSpgrNhpp6oNep7vFrdsVlSb9UKHElKrFEvrr8knm8blUnISWIS Ygjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Ymbi2nILZkkoT/1mZ1CzBGJgr7G8IVgqfMmb2j5OZeM=; b=vhP2YKsls2lmLWNDf/NMJOZQVXUvws5G04FaK7VeKtgtw3wJv0oilwDfFj98R/pfMA ImxcDzAPfj8+6d0Y9QVL9eLO9bSrYwIRbj2zAwz5dvG4z1z+ctQnEQNPfDw/QiZJsYyz VPmYu144cNQJm01FvsrvvscBjQQcLtpYlFTfC7D5kujsuqTl35NyVfjOnibAiUrb5+s0 XzbflaSxwyXDjwMmKUvxNUa2M1+Lbr/wEQMeBiY+9QhcPgKYqejqDxy3QVhoufNHzAPE xN2RIXcc0HSc+jtPqLK8P0hA3VeEMpZWOVv+eJn8h7eBznfZC38+br0W4pYRTc0rswU1 /ivw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c5si2571475pga.119.2017.05.05.12.50.06; Fri, 05 May 2017 12:50:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755916AbdEETsy (ORCPT + 6 others); Fri, 5 May 2017 15:48:54 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:49709 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755568AbdEETsi (ORCPT ); Fri, 5 May 2017 15:48:38 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lghtu-1dsRu643Fe-00oI0Z; Fri, 05 May 2017 21:48:37 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Ralf Baechle , Arnd Bergmann Subject: [PATCH 3.16-stable 81/87] MIPS: DEC: Avoid la pseudo-instruction in delay slots Date: Fri, 5 May 2017 21:47:39 +0200 Message-Id: <20170505194745.3627137-82-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:km1VyVakeCp6Kln75davTDilAuYCXLZ9ZqewBVTUc0tHaMiUp4A 9KNGUp5rVJY8nfNMPikMmoZ/bQMGzxutIMA/ROE7hE5rjoYX4VFWGZbMyq/2xkOUbRQ7GzB j9ssrPezBEzjHGHDwgvs7mejmAZ1RdOrqwbY9t2Zn/CyOjjeqSMpwotb2W//9A9NHWngzbb ExfyQMHnLJiaUAUkLxHOg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Efk3swj22QU=:Zru9CbAXshXZsDUJPCbXHD 3nwM2zjwBa/4EajTn7LwJBFUNqMksdElKSQQllmQmOZ69/2yzuoNznIWmjSQBDnFqHdSEbwGe zCPIZ8qhC5zGdcaVUQOVz+qdZ413OoH7sj0y9vhMC0S3d2qybBsdgEVgGlyEO44Ka9tSEyqJX oHDjKiUT//UPw0KgUqOZzP2c8cQJehaGf+glWWRU6cZmdi4/MgVKr+LUUZ8hIPJ4/7eikM6OK WR/gxEgHSoio40hXV6PT6MBjruRy6sz4QsbrjG1NeMDKn5Iox5Xxh3Yx/job5ahefAZD+omp5 pdvHRo9mur3K/p2wzHcvL1qo+PQyrJCSQwugDhUTLxZbPBNoEbyBZ55q5T0opatrc6lLtphlw 3xVEiCvH1OkVd4I8mKJ0Xq1y6m612Uw0NB4i0D4x2oaNYHPt05jSIbm9yuafY5Xv4/HSXVEMD o6DhlqTeeVkLzUyNa30EQbWqRPbNpHeHfkIHVSSoMwXWMm/x1gt1bTjI0928oPRfeFqidnR+9 hb6hj/CyUeK/M9ChJYsOr3nP/faov0EkupLR3GHdcjMC7D9e3KTT/Y3dHexqTXjibGqLp4su3 Tk0CgAD4gkPzB80kStGCLrHOi9pBvSeQjV5gsp7xizEqyeUm2VHXrCjsj0+iG3MK9xFkPwKJc U2nib8/GFMvjseB5fDrSMRi0DYDQ1kzARtvVumO7Dtd+XFJmGkb18ritJW7Ubuq7d+00= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ralf Baechle Commit a4d7f14bd8d3316f847c3e0f7020dad95a8a648a upstream. When expanding the la or dla pseudo-instruction in a delay slot the GNU assembler will complain should the pseudo-instruction expand to multiple actual instructions, since only the first of them will be in the delay slot leading to the pseudo-instruction being only partially executed if the branch is taken. Use of PTR_LA in the dec int-handler.S leads to such warnings: arch/mips/dec/int-handler.S: Assembler messages: arch/mips/dec/int-handler.S:149: Warning: macro instruction expanded into multiple instructions in a branch delay slot arch/mips/dec/int-handler.S:198: Warning: macro instruction expanded into multiple instructions in a branch delay slot Avoid this by open coding the PTR_LA macros. Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/dec/int-handler.S | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S index 41a2fa1fa12e..c7953f2aca4f 100644 --- a/arch/mips/dec/int-handler.S +++ b/arch/mips/dec/int-handler.S @@ -146,7 +146,25 @@ /* * Find irq with highest priority */ - PTR_LA t1,cpu_mask_nr_tbl + # open coded PTR_LA t1, cpu_mask_nr_tbl +#if (_MIPS_SZPTR == 32) + # open coded la t1, cpu_mask_nr_tbl + lui t1, %hi(cpu_mask_nr_tbl) + addiu t1, %lo(cpu_mask_nr_tbl) + +#endif +#if (_MIPS_SZPTR == 64) + # open coded dla t1, cpu_mask_nr_tbl + .set push + .set noat + lui t1, %highest(cpu_mask_nr_tbl) + lui AT, %hi(cpu_mask_nr_tbl) + daddiu t1, t1, %higher(cpu_mask_nr_tbl) + daddiu AT, AT, %lo(cpu_mask_nr_tbl) + dsll t1, 32 + daddu t1, t1, AT + .set pop +#endif 1: lw t2,(t1) nop and t2,t0 @@ -195,7 +213,25 @@ /* * Find irq with highest priority */ - PTR_LA t1,asic_mask_nr_tbl + # open coded PTR_LA t1,asic_mask_nr_tbl +#if (_MIPS_SZPTR == 32) + # open coded la t1, asic_mask_nr_tbl + lui t1, %hi(asic_mask_nr_tbl) + addiu t1, %lo(asic_mask_nr_tbl) + +#endif +#if (_MIPS_SZPTR == 64) + # open coded dla t1, asic_mask_nr_tbl + .set push + .set noat + lui t1, %highest(asic_mask_nr_tbl) + lui AT, %hi(asic_mask_nr_tbl) + daddiu t1, t1, %higher(asic_mask_nr_tbl) + daddiu AT, AT, %lo(asic_mask_nr_tbl) + dsll t1, 32 + daddu t1, t1, AT + .set pop +#endif 2: lw t2,(t1) nop and t2,t0 From patchwork Fri May 5 19:47:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98711 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292991qge; Fri, 5 May 2017 12:49:02 -0700 (PDT) X-Received: by 10.98.70.198 with SMTP id o67mr453836pfi.79.1494013742506; Fri, 05 May 2017 12:49:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.49.02; Fri, 05 May 2017 12:49:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755338AbdEETs7 (ORCPT + 6 others); Fri, 5 May 2017 15:48:59 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:63498 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755637AbdEETsp (ORCPT ); Fri, 5 May 2017 15:48:45 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LhoMU-1dtYMp1sSQ-00nC51; Fri, 05 May 2017 21:48:37 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , Ralf Baechle , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, James Hogan Subject: [PATCH 3.16-stable 82/87] MIPS: ip27: Disable qlge driver in defconfig Date: Fri, 5 May 2017 21:47:40 +0200 Message-Id: <20170505194745.3627137-83-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:152sBavXcMnJxzUxW+E9tC28GyitrFZPaEAewDl3q8rgWdJa2C3 WpLr82i+gSktqTrJc300VLd4osQMMTGjcjWDWPooEe4pe0R1EagpYFsQwZfubeNKiFhFAcQ jUHRXSZoFRz52MPeBKkLLCHwIzvTS3zivdduuVfu2j4rtED394eLm1RTT+E8S4LtxGBZwBY kwjAaKoKrx8N2DI//VKeg== X-UI-Out-Filterresults: notjunk:1; V01:K0:HprlHVCSEIc=:X7q7bnlmkZV0T3wR0vQ0Hn 51rS+YGHcNaErJvADWPlQ7eMR4wEGMv5+6QaMey8t0Td+pDXoeuEAbCTg+XkM8DppcbpkliHd 81E69UNb3a4S6mdRLdx8pYwCYN+FolVZGiHO/qyzx9qgBqGggVW/YoQxKHkKnAbpapBvK6NSN pcF8cVKKXpuVTVWlVIgw+6oUZcxL9FMmdvNMpPFkZxL3d5bX8cbiIcz2VWVTZWAdawDXIx7k4 0cmpxxzMB6Te9QleWyzOlCJFqmaauRzDKyrrHKHTP+PTLammbIIt5kbHYqIXdpSvVsIzTSxRj LDdrATYqrb6Jdt289I9/F/GqyVMnncJgUEA3QcVX38GKxov4DuOkNMCPABLSSsSQkCjZswap5 qbpni8fnrhNwCNMboDSbZNFaWOdXaVrY5mNX0N2+0BKRWUwsGwAa2oP547zDfm0/sjlRb3kxC G3FIb6bcU3131JqtJJ1Lg+ihZQoWjxWIeZOHX8J3m4R94Xt5nn+4jW67xO1Uw9A68ebs7gijt 47fXfB4cbdHpDL64sOxN+5IwNe2XFHWk07SdZ0nIkTL/cwr1ubIGxBXvAZAX5zHGoWseBPqQ/ sUIzACGH7+B1+OFO0P8qo+iO7enpitvaA7++EfR5n1/vf58sm8yRrZju2DJLOaC/FSaDXDye9 AAz9/GJcOtTuhHPbyg+sUPXSLJP82E+OOMp92aE370Uib7kOco1wztttg+OmetQOluMk= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit c64ebe32d3fc90c52277257d6c9fa7d589877cc2 upstream. One of the last remaining failures in kernelci.org is for a gcc bug: drivers/net/ethernet/qlogic/qlge/qlge_main.c:4819:1: error: insn does not satisfy its constraints: drivers/net/ethernet/qlogic/qlge/qlge_main.c:4819:1: internal compiler error: in extract_constrain_insn, at recog.c:2190 This is apparently broken in gcc-6 but fixed in gcc-7, and I cannot reproduce the problem here. However, it is clear that ip27_defconfig does not actually need this driver as the platform has only PCI-X but not PCIe, and the qlge adapter in turn is PCIe-only. The driver was originally enabled in 2010 along with lots of other drivers. Fixes: 59d302b342e5 ("MIPS: IP27: Make defconfig useful again.") Signed-off-by: Arnd Bergmann Cc: Ralf Baechle Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15197/ Signed-off-by: James Hogan Signed-off-by: Arnd Bergmann --- arch/mips/configs/ip27_defconfig | 1 - 1 file changed, 1 deletion(-) -- 2.9.0 diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 0e36abcd39cc..7446284dd7b3 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -206,7 +206,6 @@ CONFIG_MLX4_EN=m # CONFIG_MLX4_DEBUG is not set CONFIG_TEHUTI=m CONFIG_BNX2X=m -CONFIG_QLGE=m CONFIG_SFC=m CONFIG_BE2NET=m CONFIG_LIBERTAS_THINFIRM=m From patchwork Fri May 5 19:47:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98712 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292999qge; Fri, 5 May 2017 12:49:03 -0700 (PDT) X-Received: by 10.98.215.26 with SMTP id b26mr19064575pfh.162.1494013743077; Fri, 05 May 2017 12:49:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.49.02; Fri, 05 May 2017 12:49:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755654AbdEETtA (ORCPT + 6 others); Fri, 5 May 2017 15:49:00 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:50311 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754768AbdEETsp (ORCPT ); Fri, 5 May 2017 15:48:45 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MeGdC-1dPtSV3C18-00PrH9; Fri, 05 May 2017 21:48:37 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Ralf Baechle Subject: [PATCH 3.16-stable 83/87] MIPS: ip22: Fix ip28 build for modern gcc Date: Fri, 5 May 2017 21:47:41 +0200 Message-Id: <20170505194745.3627137-84-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:jXR50+s0Juw+AbpmOeZZJTItSLRf4x1Vmrb7GXxRkdHT1SM/nXI FAas18mVsMfvKQgpfX90ufq+BSGRnw5/pKUMsyVXVPwj3akJa3qsHqfaEU98sNZ5tamzV82 Ko9yrCHARAPOKqJyAwRC0we1jolEyISiRmoaMe/eJUx5GBgWgXYoMaFw/bGmC+nHwyYJc6H In/QQAP2v788+UD6TZ3mQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:tQdujVvIEeQ=:9pwUygk3mdeRVnt7Q3Nsnm ZnG0NssN/oXjYrl9o8y/e5RjjVJsMcsRuMFkjDxQzJ2p1Du/JcfSEo134hR4hVW6bLdy3DmaG 8cEhMYBJJuLZp3jE1qfOwjv4OD2v6xsAycdq/AYH/xKY3mhRK3fgb1je5Ifdaa9nBat7vyM5p 6l4BYO2+o3GthaS7L/0YQW10Jt0zdo5/QJ7Y6kQmH6zA44nd3E0VMJnbDDQaZIBrYi35z5XI2 H1fZDxzv99nYxxI9slCcaoptfUitky1I2oFv6ImxyBDqWmu6rs2jgyj7PlHnynfhX77mni1Ww BAP5mqB37ceJNFlfQ1evMlMxPyFNLzLnxenwT+LovOYa3C1t+HUcX0CM5Jfyd1Y/TQQxkOxG3 wEQtovQlfhSsg5lELSHsf9Ge0DoynOpGt/TnWEMpe+7zncUry7yeSAoVmRmrlUmq7o0cWhm5/ dCjTz2qWbFuOq7NZvdXig3kIp0Ts+5uMhSpMAQ/+Ro6Kh92j0TjqWlGz9hBRxQPZGyPZ9lUIL AMn6zFeZyW3CjqQtMZPCYQFl+CPyseOH1TqMXXsKqE1MB8alJkGFmAz5v2XKdFIQX5Dc/pL2R +wHvVr3qBSETHqSh7oULnE9Fh/mwaMvlciq4lD4SqIpqnMvy6gXcLFjNlUFl6EPYjLOEJRK8f bnreAJD0+9TV7RnzOI9F9n2fk5/nu3Sk+oukXGbDJk7HTnwThMm4ZOWDSoRNUGI4EN+M= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit c3ef8bf59deea37d1105ffb771b163d3c322fff7 upstream. kernelci reports a failure of the ip28_defconfig build after upgrading its gcc version: arch/mips/sgi-ip22/Platform:29: *** gcc doesn't support needed option -mr10k-cache-barrier=store. Stop. The problem apparently is that the -mr10k-cache-barrier=store option is now rejected for CPUs other than r10k. Explicitly including the CPU in the check fixes this and is safe because both options were introduced in gcc-4.4. Signed-off-by: Arnd Bergmann Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15049/ Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/sgi-ip22/Platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform index b7a4b7e04c38..e8f6b3a42a48 100644 --- a/arch/mips/sgi-ip22/Platform +++ b/arch/mips/sgi-ip22/Platform @@ -25,7 +25,7 @@ endif # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys # ifdef CONFIG_SGI_IP28 - ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n) + ifeq ($(call cc-option-yn,-march=r10000 -mr10k-cache-barrier=store), n) $(error gcc doesn't support needed option -mr10k-cache-barrier=store) endif endif From patchwork Fri May 5 19:47:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98708 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292990qge; Fri, 5 May 2017 12:49:02 -0700 (PDT) X-Received: by 10.98.160.24 with SMTP id r24mr18936746pfe.16.1494013742207; Fri, 05 May 2017 12:49:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.49.01; Fri, 05 May 2017 12:49:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755676AbdEETs7 (ORCPT + 6 others); Fri, 5 May 2017 15:48:59 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:53481 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755654AbdEETsp (ORCPT ); Fri, 5 May 2017 15:48:45 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MXi7y-1dav1E0O8c-00WU2d; Fri, 05 May 2017 21:48:38 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Sergey Ryazanov , Linux MIPS , Ralf Baechle , Arnd Bergmann Subject: [PATCH 3.16-stable 84/87] MIPS: MSP71xx: remove odd locking in PCI config space access code Date: Fri, 5 May 2017 21:47:42 +0200 Message-Id: <20170505194745.3627137-85-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:vepfLDJGfJeS3SkmxoExcga3zrrnB6J74u5Ef3PvPQHXTsaymxE PrnsbUsrDTz3FtF5PT4+hjjyoZjGcJDtnSm71C0dGiJGmZsw1k9UTQ4FWIQkE6z8ml/ojVi +JxGwR91Eu6/1VyUn9of56vIEyOCruA+5cOZNYgbbSOdFOpMV9wtNrwhkP7wsAAGdgWQGTz KLl2VIrE8pheE60B3/Euw== X-UI-Out-Filterresults: notjunk:1; V01:K0:dK0gL/aRSLM=:faLg2k/HGXr9rVbbSIV0t5 20bx/CRVDXDIVSQJFIw7eJO8ttf6QZZCPLQM4LmBVIeoExykQQ23c+Zaw4GHwPIzAXoJ/fFtN /d+bXBWKiCHHRiok1Hard2Bcs++hooVVL6oMLB9tCco/w1Wsef2dChkvd2uFsc2ptJerIodAc /sMaZf011WAeiKMkSwoylZB0djrFNkgqRmPeCq5T05vQRHh+8IZ5Pbnw8bgUUX8eOx59yLwkW 4boDt/uK3iuhazzYUh6ASPSXIsuBz+LFmjzAsIG3qM1nzzZC1FVzF7i8pakv3KMTuxF4MLWG0 jDlpmwtyAJv4n650WgmkxdOVdAxNFYTH7oGAg/z8yIZbtSXG2DOGSVASZvxzmMU4psJuU4gqQ Eo6UTVEQUBgCeN5ep3bve1kVwWHut4zyiaKdNsBnbonghrNeazSuaNg7xLSYK8Y/Tf1XDRd6y 0XeZVrEVuqqyWRwIEUMnHribtJGCXcVGTPUK8KJQVt1WLc/4jcXSRBTF6fgY6i1n9RVIO1/MU SvVyxd4yI6QLMysnbPpXIDJVnEjSOC8EsJf4dtvc/Nc3MLvZd3eUGl02AAPE3ee25jpE5EC93 1s5JB5ybAxQcaoXeuAml/28zzPGBRGpfWPwyxUpNPl0IQVfIhSjiWaYXhI2L4M1FYQcMg9CRB GuDtT0JHglQeE3Y8BJ9CQb/fiPL+x+vFzd4I5IJ99ucF7f591bR6QlZD7h7/e73+nKYo= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sergey Ryazanov Commit 7b2cae08b63e2acc94139c3dda557ac84165b327 upstream. Caller (generic PCI code) already do proper locking so no need to add another one here. Signed-off-by: Sergey Ryazanov Cc: Linux MIPS Patchwork: https://patchwork.linux-mips.org/patch/7601/ Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/pci/ops-pmcmsp.c | 12 ------------ 1 file changed, 12 deletions(-) -- 2.9.0 diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c index 50034f985be1..dd2d9f7e9412 100644 --- a/arch/mips/pci/ops-pmcmsp.c +++ b/arch/mips/pci/ops-pmcmsp.c @@ -193,8 +193,6 @@ static void pci_proc_init(void) } #endif /* CONFIG_PROC_FS && PCI_COUNTERS */ -static DEFINE_SPINLOCK(bpci_lock); - /***************************************************************************** * * STRUCT: pci_io_resource @@ -368,7 +366,6 @@ int msp_pcibios_config_access(unsigned char access_type, struct msp_pci_regs *preg = (void *)PCI_BASE_REG; unsigned char bus_num = bus->number; unsigned char dev_fn = (unsigned char)devfn; - unsigned long flags; unsigned long intr; unsigned long value; static char pciirqflag; @@ -401,10 +398,7 @@ int msp_pcibios_config_access(unsigned char access_type, } #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) - local_irq_save(flags); vpe_status = dvpe(); -#else - spin_lock_irqsave(&bpci_lock, flags); #endif /* @@ -457,9 +451,6 @@ int msp_pcibios_config_access(unsigned char access_type, #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) evpe(vpe_status); - local_irq_restore(flags); -#else - spin_unlock_irqrestore(&bpci_lock, flags); #endif return -1; @@ -467,9 +458,6 @@ int msp_pcibios_config_access(unsigned char access_type, #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) evpe(vpe_status); - local_irq_restore(flags); -#else - spin_unlock_irqrestore(&bpci_lock, flags); #endif return PCIBIOS_SUCCESSFUL; From patchwork Fri May 5 19:47:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98722 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293425qge; Fri, 5 May 2017 12:50:05 -0700 (PDT) X-Received: by 10.84.195.129 with SMTP id j1mr2962089pld.122.1494013805640; Fri, 05 May 2017 12:50:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c5si2571475pga.119.2017.05.05.12.50.05; Fri, 05 May 2017 12:50:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755924AbdEETt5 (ORCPT + 6 others); Fri, 5 May 2017 15:49:57 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:59475 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755901AbdEETsz (ORCPT ); Fri, 5 May 2017 15:48:55 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MHwWD-1d3hsZ3tkb-003faS; Fri, 05 May 2017 21:48:39 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Atsushi Nemoto , linux-mips@linux-mips.org, Ralf Baechle , Arnd Bergmann Subject: [PATCH 3.16-stable 86/87] MIPS: TXx9: Delete an unused variable in tx4927_pcibios_setup Date: Fri, 5 May 2017 21:47:44 +0200 Message-Id: <20170505194745.3627137-87-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:DnDlacf8V0vsrNNzUbm9t5pCckPEqgP4GiEMEJfStwmbTiFqS0P MLvDrM+LNHoXpWEzY53B1bktd94W+JHphP8b09eIBT1Nlcg15ZGjsq3ZrC0sw1SuK2W4Bc8 35OEp4M2SxP+d22lneOUoV2+tApF1XXlkyzmKwCz+YQ5oT148SAEBnS3PpOX6tN/urJTig1 qlvWGt8HRMhbwnvmG3TaQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:z5xSBdqGGiU=:Oi42b7lkrrbnBG9O5TEiip fq0lrm+s/53utNd8aMAwdxC7Qa1w0BPu6hw+iWjhRQx+YjJ6xfUC8qDrmkXnCHJtpgpxFdLUk HZUucZXId2UcWN9vsumJqbyljJpkJqrqkxACNjAjjV3MOD+5HUm2dY0Jq1Bqb7geonBk2mhRd 29dJ+6C5F/AjJwqWdKz5gCgK18yuxc2zKYgd0yYJsrYIoALDVIaaIPOB5tP+nNrNlO4xaCPVl 0JTWTz6Qt/OahQaOKxVM525btWzKpGurDRVocEgUe7gjgrVhL3ncG1jg+0y7oMAa8sBR+l0TY Pm31aLw0JFZwZFr8bd62mfrjZYfCocvIW9yN+qsxhgv/+hnNtiOlU2/UwetgpcO+rqsf3d1Fp XTw3I/TxsRj3gxjOYe/fDg3FGJSZHNUlrdus4ZQ2u20IWH7TLZcuMkuGQIpDvfd4JF2Up3ikT nb5xVralgwhJ4Qu/GhbuMURwSqkEBftsKnmXAeP7pJHNpE8N5uejGF1ysTCCI89CtntjLVJMh HsSnxB6ErnbxV0m265TT1JnY4XNYhTtzMerATYx7Ezl46t8c/6Zty27LeNQZ6RXX9pA8I5/kR V6lc/A+QXN6lXFNYwD/3zndkYNwyWwTfH7MxSfbjQTRJogpWgzp5h83GMaDPisG1WlAUPe5uH 0nTpJB91Vhm0OcDqD42SGm7beOjb7BhEUctZykXhmXTJ6nIokYYoXZCMVUrscPVIGD/I= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Atsushi Nemoto Commit 32a51c797870e434c2afbfe60399c6497fc524ed upstream. Signed-off-by: Atsushi Nemoto Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/7216/ Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/pci/ops-tx4927.c | 2 -- 1 file changed, 2 deletions(-) -- 2.9.0 diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c index 0e046d82e4e3..d54ea93651ac 100644 --- a/arch/mips/pci/ops-tx4927.c +++ b/arch/mips/pci/ops-tx4927.c @@ -199,8 +199,6 @@ static struct { char *tx4927_pcibios_setup(char *str) { - unsigned long val; - if (!strncmp(str, "trdyto=", 7)) { u8 val = 0; if (kstrtou8(str + 7, 0, &val) == 0) From patchwork Fri May 5 19:47:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98709 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292996qge; Fri, 5 May 2017 12:49:02 -0700 (PDT) X-Received: by 10.99.189.2 with SMTP id a2mr5448501pgf.85.1494013742796; Fri, 05 May 2017 12:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494013742; cv=none; d=google.com; s=arc-20160816; b=N3z4tYV9tJthjy8S6UvpAt1bbI5ycNFA3o5gV8h4KV4KpyCnsIanCrIQs+EH6DmE7Z rGFDpxoyI1Qzh0Op38Edimh4VeBSEUkzO6eL75ghN/6ZEHjMweg91sJ9jSaTBa8G00sv 4Pp3TWce9tobsmAKoBZHbi4DYpOTmLEv1BH+Fk5yCOArHzD50SB3sbxlzQ82unGzRVgO 2lyA4EjzLC/W6vDmtuHANVa26bSZEqSAbEwT3gmNs10mULp0D5eFyeP1DJT8gGY+xPC+ Va8Bq04AgEkBtQnZQzSlpsb4SRmyaSMHbgu7wRguScrcB7fVhj8c8fD/eU+gvkyGZ82S tWQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=y54qUlmHpPunJOB34L4TT3uYxkI1n3JXwC+vasWQhpc=; b=Zu4BRrIIR0TTt+d7TpfD0wLBZ1qNy5agjnXykkbDgEbjvuDus3m/bSHRzGJcKs0q50 WxaMXO9dEyOV+IaCDc8/nnpxhEc+/5ZcUbu+w+YT+OBYfV7D76sJcqkxlQgRLE1y93hZ hwl6vJ9LE6+XKz1RSly1AIGkMM+wt/DIQY4wHDTXcHq9FrTQUnej/vFOBZiGdJgZ3Vc1 iuA7+8jWChFmBYD2YT0af3CXe3M8fNtjMlgk8tkf9lX8Gf5qbuUknNpqGjoimprYOc72 qfyjZD41uL4IK7yLBnoL3Y/RPcw/1dZcoIL4r/pozYgU2/qJ/cpke8xCBMpSpi/wJOXH k4jw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.49.02; Fri, 05 May 2017 12:49:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755871AbdEETtB (ORCPT + 6 others); Fri, 5 May 2017 15:49:01 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:59200 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755749AbdEETsq (ORCPT ); Fri, 5 May 2017 15:48:46 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MSDwg-1dVRuf0sR8-00TDJX; Fri, 05 May 2017 21:48:39 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Ralf Baechle , Arnd Bergmann Subject: [PATCH 3.16-stable 87/87] MIPS: elf2ecoff: Fix warning due to dead code. Date: Fri, 5 May 2017 21:47:45 +0200 Message-Id: <20170505194745.3627137-88-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:yPQw2wy38POlvKrlcilzcgzzTlgzpKyeVNsRZn5YpkWqaVrom+0 otTvklaHCz39uky+ZBNQtd11W3SKnGTar6oW/tyJfQYKvGiY+n6JWQ4RjsO06iFTZOgnmN7 HCCA3oMyCeZCgXK8eiteC3KZ3Zfbgg+1SykEsjvbR0TKvAlkNsawUmkDHy3J6H9LhTWAwub gk2/t+cL61nVmlisPjY7A== X-UI-Out-Filterresults: notjunk:1; V01:K0:AS2MScfaAds=:UzRSJrfzzo67l49a/ICbQa mNFt6fmOb/HBezzg142l1n/5AmGeejBcsrU9fDpR2yM4zM+QxJcUItQU8JJcslvdfc+s9eHsq RhhauTdEwu3CRVptI656I/KUogeV9fzEv6ntmTS3q8EV7tN+7IFYdXdwBMPKC9B4D+P6eFp3u RmhtR7B/TeEiT97T70busYKQW1nwyDD0VoJ2LfRRDIxfwCA0ffUSQKG0AwcYGrCm274hotXmh T5cIO4wZYWN4N2fjtCfUGiOeM5SqjiHkAUR5chLV8Aom8uwNLJtyJULqlXZIv0dT3o21i8Gq4 dRiwQPcOx9GLUmqvoXrZ8DX/+p7Bt7PQQxgA2/X3R9YrRt93yrPMZuZCbiUXuM+8Iltn9/Jev mjLCkOfZ+fpgTIqy7L4VMomIWtvSWgOTmXeH38an82dXa49Spd3cckzOyLtmgRHN7DmY7xN+b x2tcCLmz0wXDFQiOdOFrlgp+Nv+7pdlXWfWzVtUDfFBSB4pwBXqYXjkjDga0ocaiH1bR/m8dV FgrLSE1TNA4630lCjiv68N+S8gMcNsRm/19oOZiHvVjlMqnPON+FwMLxmXe+uFOrQV1Nnqan5 UU1cCwtqymaBroKxW8/4AUSE0mxhSGbl4sykhNInVEFgstV9+wQAUcxPc0DLt5fMjw0bf0gDQ jpzZ/logSabTsHgB4NPOtCz54BciFw0r3W9CJ20/zTbYngI2yz6aQOdHWQgpQIe3TNA+ztEHK JJwT48VkBjdy015I Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ralf Baechle Commit 8cf6adea726b0e4abcc982b6e7e29915a620c90c upstream. HOSTCC arch/mips/boot/elf2ecoff arch/mips/boot/elf2ecoff.c: In function ‘main’: arch/mips/boot/elf2ecoff.c:271:8: warning: variable ‘shstrtab’ set but not used [-Wunused-but-set-variable] char *shstrtab; Signed-off-by: Ralf Baechle Signed-off-by: Arnd Bergmann --- arch/mips/boot/elf2ecoff.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.9.0 diff --git a/arch/mips/boot/elf2ecoff.c b/arch/mips/boot/elf2ecoff.c index 8585078ae50e..bef06453edc0 100644 --- a/arch/mips/boot/elf2ecoff.c +++ b/arch/mips/boot/elf2ecoff.c @@ -267,7 +267,6 @@ int main(int argc, char *argv[]) Elf32_Ehdr ex; Elf32_Phdr *ph; Elf32_Shdr *sh; - char *shstrtab; int i, pad; struct sect text, data, bss; struct filehdr efh; @@ -335,9 +334,6 @@ int main(int argc, char *argv[]) "sh"); if (must_convert_endian) convert_elf_shdrs(sh, ex.e_shnum); - /* Read in the section string table. */ - shstrtab = saveRead(infile, sh[ex.e_shstrndx].sh_offset, - sh[ex.e_shstrndx].sh_size, "shstrtab"); /* Figure out if we can cram the program header into an ECOFF header... Basically, we can't handle anything but loadable