From patchwork Sat Dec 2 15:52:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 120422 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2499689qgn; Sat, 2 Dec 2017 08:12:21 -0800 (PST) X-Google-Smtp-Source: AGs4zMb3vVw7nW3Z4PknT90UXOk7USKuGSJ8wBNQvbxH60r++MODPkFoa3Bfl5oD5e9xTqQE6k+6 X-Received: by 10.98.71.90 with SMTP id u87mr14087169pfa.75.1512231140949; Sat, 02 Dec 2017 08:12:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512231140; cv=none; d=google.com; s=arc-20160816; b=ZDV9g0avPwJIfUifCkH+JxAhIiuJfTJFkKH7PDGHHFnaV9SGSELdSIAQ+xnyT6uuKU B4NyNMes+OFcamCPIztdFLsdhxwLh8PXcW7JLhfjma0dLxRowBY8XSFYL7Kaoudoqkwt hYruHiLAxUPlQUJNfxuk1HhkH18vGOP1ZyxU/fzQgSecbHfPEDVDUSKu8xQR/E0d7uM3 a17vSeB6fQODlJpTd9tzqpEu8wIN4DLlj4Xsu81bV2SgMTu8GTRHzqpJqmJIO2/kC9Gx gLoCPpXjWzxZwwyvJBdrFxspdtE6C1Expkr8foH9fwC9t40evc+KE+Tc6/M3QgnVjvF4 lCEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:to:cc:from:dkim-signature:dkim-signature :dkim-signature:arc-authentication-results; bh=pyRsWcEmZLPEqezl7sK2TEqezWr+UMOPiurI2cLxyhc=; b=ZdENKJmyVZFI3/CKk7kE1TefXkRBACgRzR45rgG5Zr8Wap4NlWZNEKUYk8Axa6CVCT /HM6JhUN9hrmaX7lgCqJ36iSILYHAkOFTw/VtwyYVloyTwOX7x9MtjZL7e9BEI5vL8SR r97ZJLoGjz9vD4z2J6oDRHVsn/uACL2R44kLoyHA5tiEO1uHH3Pxn9K4Wet+XjRyA1Wu s2b/HOwhpDIL66BuSeY1fifiNoXrPa53t+XIng9XW2f+Nhs+Tka0elhMS95598K/TymX Pf7NnU+2T1JxTmjwORZgsqpEjfdMbmeIdmh3uF/T8W2ZrxyKmer+OCLhm2g/E9Og7cc/ c9tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@verizon.com header.s=corp header.b=fv5eRbJp; dkim=fail header.i=@verizon.com header.s=corp header.b=qDgccx2n; dkim=fail header.i=@verizon.com header.s=corp header.b=S14/uaJD; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p21si7031337pfi.396.2017.12.02.08.12.20; Sat, 02 Dec 2017 08:12:20 -0800 (PST) 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; dkim=fail header.i=@verizon.com header.s=corp header.b=fv5eRbJp; dkim=fail header.i=@verizon.com header.s=corp header.b=qDgccx2n; dkim=fail header.i=@verizon.com header.s=corp header.b=S14/uaJD; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751885AbdLBQMS (ORCPT + 9 others); Sat, 2 Dec 2017 11:12:18 -0500 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:1751 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752700AbdLBPx3 (ORCPT ); Sat, 2 Dec 2017 10:53:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512230009; x=1543766009; h=from:cc:to:subject:date:message-id: content-transfer-encoding:mime-version; bh=/0agmksBM5kcM6vlRUDFu/3G8iyDFyxeMpFo7Buvg9k=; b=fv5eRbJpNBsaONV8gE6/IlMnh2K6hLBPMb/3v6V13qagf+o4xdMXzkEA 30Tj2WEpHUxyD0Yx4HQwPwHB1R4pn9+J81oEFLbphtDBDIoJwp8ypjLBm T99JQj0PiV8S3CYBqxEKjynz6TFrpu8g6eoGkmjb8wZP//2YqJH3UbbMg A=; Received: from unknown (HELO fldsmtpi02.verizon.com) ([166.68.71.144]) by fldsmtpe03.verizon.com with ESMTP; 02 Dec 2017 15:53:21 +0000 Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi02.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Dec 2017 15:52:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512229976; x=1543765976; h=from:cc:to:subject:date:message-id: content-transfer-encoding:mime-version; bh=/0agmksBM5kcM6vlRUDFu/3G8iyDFyxeMpFo7Buvg9k=; b=qDgccx2nOgkBphxp9mz1ulb8hidr70ercGVLecOuBRHV33+5xbYObTDj QuK73735z2+emKsSi7V/9oOxr/aEPBA4d1Nl98hvu2Qm2XDhJ2jBcwRsT bfM8Q7bZQi4nWzrdrEtnEvupWbcnWOY3hCuxOJHYPXEWFdpXy1wj28APF I=; Received: from endeavour.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.163]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Dec 2017 10:52:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512229976; x=1543765976; h=to:subject:date:message-id:content-transfer-encoding: mime-version:from:cc; bh=/0agmksBM5kcM6vlRUDFu/3G8iyDFyxeMpFo7Buvg9k=; b=S14/uaJD1zBxZKD5KAJS7kIy6JIiYg2EZdSib4TPipbbAgd0BNWb978h CXXIqJ3lOVGRaWvxF4YbGUgp3tk030RQuORAkiBtRGV7bESVIIDWJT1Wn aB77UZvXbP/VU1KnW5GjqkQvjBVAa1j0Y7E4LnvCO5H9iSZpeoPSI9EGh Y=; From: alexander.levin@verizon.com Cc: Masahiro Yamada , alexander.levin@verizon.com X-Host: endeavour.tdc.vzwcorp.com Received: from ohtwi1exh001.uswin.ad.vzwcorp.com ([10.144.218.43]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 02 Dec 2017 15:52:56 +0000 Received: from tbwexch14apd.uswin.ad.vzwcorp.com (153.114.162.38) by OHTWI1EXH001.uswin.ad.vzwcorp.com (10.144.218.43) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sat, 2 Dec 2017 10:52:55 -0500 Received: from OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) by tbwexch14apd.uswin.ad.vzwcorp.com (153.114.162.38) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 2 Dec 2017 10:52:55 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA19.uswin.ad.vzwcorp.com (144.8.22.197) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 2 Dec 2017 09:52:54 -0600 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Sat, 2 Dec 2017 09:52:54 -0600 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH AUTOSEL for 4.9 01/33] kbuild: pkg: use --transform option to prefix paths in tar Thread-Topic: [PATCH AUTOSEL for 4.9 01/33] kbuild: pkg: use --transform option to prefix paths in tar Thread-Index: AQHTa4WEVY6riOULv0S3qabrmcZUQQ== Date: Sat, 2 Dec 2017 15:52:12 +0000 Message-ID: <20171202155204.7691-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada [ Upstream commit 2dbc644ac62bbcb9ee78e84719953f611be0413d ] For rpm-pkg and deb-pkg, a source tar file is created. All paths in the archive must be prefixed with the base name of the tar so that everything is contained in the directory when you extract it. Currently, scripts/package/Makefile uses a symlink for that, and removes it after the tar is created. If you terminate the build during the tar creation, the symlink is left over. Then, at the next package build, you will see a warning like follows: ln: '.' and 'kernel-4.14.0+/.' are the same file It is possible to fix it by adding -n (--no-dereference) option to the "ln" command, but a cleaner way is to use --transform option of "tar" command. This option is GNU extension, but it should not hurt to use it in the Linux build system. The 'S' flag is needed to exclude symlinks from the path fixup. Without it, symlinks in the kernel are broken. Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/package/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.11.0 diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 71b4a8af9d4d..7badec3498b8 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -39,10 +39,9 @@ if test "$(objtree)" != "$(srctree)"; then \ false; \ fi ; \ $(srctree)/scripts/setlocalversion --save-scmversion; \ -ln -sf $(srctree) $(2); \ tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \ - $(addprefix $(2)/,$(TAR_CONTENT) $(3)); \ -rm -f $(2) $(objtree)/.scmversion + --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \ +rm -f $(objtree)/.scmversion # rpm-pkg # --------------------------------------------------------------------------- From patchwork Sat Dec 2 15:52:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 120423 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2499720qgn; Sat, 2 Dec 2017 08:12:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMYgTlKXjqWyByn2O5rNGbocQ5T3VXN4b7767Np6U3Z3wTnpySSjPGy2Xkiw/whykyxJPUIg X-Received: by 10.101.86.197 with SMTP id w5mr9281809pgs.190.1512231142495; Sat, 02 Dec 2017 08:12:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512231142; cv=none; d=google.com; s=arc-20160816; b=tGCQ8GXKAO9YClsuLc1eWUiSqriWSyX2ZmLCRQkj0oeX3fJH4Hj80Z5qd7E21IYjtv 3oZ3rPGakJ5eJQQaomSIR9gNJJnxOzdRBB775ia6kT1UhDMS8fa04ueMBPRVBbKVzF4M CNmzyVa0yOmKJiURnzWa2Fs4jkHFP0h3UMZa60/Cumd4dky4R95zrKgldSKnFpymgYM2 0TKr1W5vIIeE7bSq13g/woxHwUsEzdkDL47cY5wtcgqSElpiWIhbTO+QZlg6Iz8/fRJD FtOyKOfV347x8Qlvw1GXzzQV9h+J4VqqVTwrK+qNzup+e2JGwgClHqJEhHp6PcCMdXKh zdKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:to:cc:from:dkim-signature :dkim-signature:dkim-signature:arc-authentication-results; bh=MK4VUYC/Jf8s0NfpIh1oaWWgm5pL5FMH2vqO3RUXPb4=; b=RqszquIS5MPl5EvrSBIXLSlmsk6PdIiDBlbuSzG3NgdVSwL7fdSwmawyqHs76gftdc J/hDcW61BkSQtBvOcD6MPpP/MwHOwGBv7ivrD7x7DybzoCHL9PL/Wdy9w71yAr2cH9GT rXirRcrTSahdvCCt/SL/+TogHvq9QO7L5Wt+ZeSx49ZR4IFS/nIaasbX0Tg67XdAd5Rk mTYgIw890gft7mTQTFs06DXxF34OanQIj0rC2ZBVEK0Fcd0mY1ye1qe4ZU7FFpDpB85I yVBJuLdGcp9inpbwKHdqZ6EMtKBBcS3IAH9B62154QwMXDpEScxnFU+RbjMlvAjHf2il lr9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@verizon.com header.s=corp header.b=rONluqgS; dkim=fail header.i=@verizon.com header.s=corp header.b=rChwS+pd; dkim=fail header.i=@verizon.com header.s=corp header.b=NU5+sMEB; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p21si7031337pfi.396.2017.12.02.08.12.22; Sat, 02 Dec 2017 08:12:22 -0800 (PST) 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; dkim=fail header.i=@verizon.com header.s=corp header.b=rONluqgS; dkim=fail header.i=@verizon.com header.s=corp header.b=rChwS+pd; dkim=fail header.i=@verizon.com header.s=corp header.b=NU5+sMEB; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752700AbdLBQMU (ORCPT + 9 others); Sat, 2 Dec 2017 11:12:20 -0500 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:59457 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752695AbdLBPx3 (ORCPT ); Sat, 2 Dec 2017 10:53:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512230009; x=1543766009; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=4J3pAQa+P3pnngaJAIfL79ADMbNp7vuy8sy/OoFMu3Y=; b=rONluqgSGYNddfb/fmpGCDQAaTPuEcRiXQ9ZlvcOkSkNJtuYTXzcgePN Ft13HHST3ntklgXcG4tyPohH8ra1GxhwtC0+3YOm9wZLd3TdK1qCzycch lggKVQ8HxKV5MulP4Vr1PB+a31cP6DupB3TJJF70GChw+PVCyDCXGcSHx g=; Received: from unknown (HELO fldsmtpi02.verizon.com) ([166.68.71.144]) by fldsmtpe03.verizon.com with ESMTP; 02 Dec 2017 15:53:21 +0000 Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi02.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Dec 2017 15:53:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512229995; x=1543765995; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=4J3pAQa+P3pnngaJAIfL79ADMbNp7vuy8sy/OoFMu3Y=; b=rChwS+pdP2N/M10XXDK2qtG3FZ2oDh2EFZGaOJsPI+1DJh+l9+A1jc10 0nkeugZxo3t0i9obZpohE0/NtuaPxwUNZCXLyMAvn/lUcGxAlVk9NjIn2 Uvza8iACtFgNw9okmVg1IQ9DyiMzIwLcT9pKT0lllGTp8x4K9iE3ObXv6 8=; Received: from mariner.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.84]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Dec 2017 10:53:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512229994; x=1543765994; h=to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from:cc; bh=4J3pAQa+P3pnngaJAIfL79ADMbNp7vuy8sy/OoFMu3Y=; b=NU5+sMEB3PY+YHewxI07lYwrIGGugsxoW79Zioqw3JeiMdoTkD9MAupc FbE0IM3RrdS0YhN2Ko7NYvWx6yhJ7LxeiNJVoVpZl67A3Qw/nVW4dtzP5 Sty8mqtbhHSPeV4HR43V2vb4lsumDcPMxXj/vFyVz/6LMULh+zthJP35J s=; From: alexander.levin@verizon.com Cc: Masahiro Yamada , alexander.levin@verizon.com X-Host: mariner.tdc.vzwcorp.com Received: from ohtwi1exh003.uswin.ad.vzwcorp.com ([10.144.218.45]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 02 Dec 2017 15:52:56 +0000 Received: from tbwexch26apd.uswin.ad.vzwcorp.com (153.114.162.50) by OHTWI1EXH003.uswin.ad.vzwcorp.com (10.144.218.45) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sat, 2 Dec 2017 10:52:56 -0500 Received: from OMZP1LUMXCA20.uswin.ad.vzwcorp.com (144.8.22.198) by tbwexch26apd.uswin.ad.vzwcorp.com (153.114.162.50) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 2 Dec 2017 10:52:55 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA20.uswin.ad.vzwcorp.com (144.8.22.198) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 2 Dec 2017 09:52:55 -0600 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Sat, 2 Dec 2017 09:52:55 -0600 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH AUTOSEL for 4.9 02/33] coccinelle: fix parallel build with CHECK=scripts/coccicheck Thread-Topic: [PATCH AUTOSEL for 4.9 02/33] coccinelle: fix parallel build with CHECK=scripts/coccicheck Thread-Index: AQHTa4WFFokPdNSQ/0WZFg9uCHSHvA== Date: Sat, 2 Dec 2017 15:52:13 +0000 Message-ID: <20171202155204.7691-2-alexander.levin@verizon.com> References: <20171202155204.7691-1-alexander.levin@verizon.com> In-Reply-To: <20171202155204.7691-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada [ Upstream commit d7059ca0147adcd495f3c5b41f260e1ac55bb679 ] The command "make -j8 C=1 CHECK=scripts/coccicheck" produces lots of "coccicheck failed" error messages. Julia Lawall explained the Coccinelle behavior as follows: "The problem on the Coccinelle side is that it uses a subdirectory with the name of the semantic patch to store standard output and standard error for the different threads. I didn't want to use a name with the pid, so that one could easily find this information while Coccinelle is running. Normally the subdirectory is cleaned up when Coccinelle completes, so there is only one of them at a time. Maybe it is best to just add the pid. There is the risk that these subdirectories will accumulate if Coccinelle crashes in a way such that they don't get cleaned up, but Coccinelle could print a warning if it detects this case, rather than failing." When scripts/coccicheck is used as CHECK tool and -j option is given to Make, the whole of build process runs in parallel. So, multiple processes try to get access to the same subdirectory. I notice spatch creates the subdirectory only when it runs in parallel (i.e. --jobs is given and is greater than 1). Setting NPROC=1 is a reasonable solution; spatch does not create the subdirectory. Besides, ONLINE=1 mode takes a single file input for each spatch invocation, so there is no reason to parallelize it in the first place. Signed-off-by: Masahiro Yamada Acked-by: Julia Lawall Signed-off-by: Sasha Levin --- scripts/coccicheck | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) -- 2.11.0 diff --git a/scripts/coccicheck b/scripts/coccicheck index ec487b8e7051..c36b04b41686 100755 --- a/scripts/coccicheck +++ b/scripts/coccicheck @@ -29,12 +29,6 @@ else VERBOSE=0 fi -if [ -z "$J" ]; then - NPROC=$(getconf _NPROCESSORS_ONLN) -else - NPROC="$J" -fi - FLAGS="--very-quiet" # You can use SPFLAGS to append extra arguments to coccicheck or override any @@ -69,6 +63,9 @@ if [ "$C" = "1" -o "$C" = "2" ]; then # Take only the last argument, which is the C file to test shift $(( $# - 1 )) OPTIONS="$COCCIINCLUDE $1" + + # No need to parallelize Coccinelle since this mode takes one input file. + NPROC=1 else ONLINE=0 if [ "$KBUILD_EXTMOD" = "" ] ; then @@ -76,6 +73,12 @@ else else OPTIONS="--dir $KBUILD_EXTMOD $COCCIINCLUDE" fi + + if [ -z "$J" ]; then + NPROC=$(getconf _NPROCESSORS_ONLN) + else + NPROC="$J" + fi fi if [ "$KBUILD_EXTMOD" != "" ] ; then From patchwork Sat Dec 2 15:52:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Levin, Alexander \(Sasha Levin\)" X-Patchwork-Id: 120424 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2499781qgn; Sat, 2 Dec 2017 08:12:25 -0800 (PST) X-Google-Smtp-Source: AGs4zMbsVlyuxoYk5nIsQWP4XSRD7Rk5d9GYyjAGHzofq1LSFhrGMe/ueiec+J3eNGDXfD+F/vkM X-Received: by 10.84.157.74 with SMTP id u10mr9901793plu.414.1512231145666; Sat, 02 Dec 2017 08:12:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512231145; cv=none; d=google.com; s=arc-20160816; b=ytxrOlz9WVo73ULpk/AwqLXofAwU/e+dXLqNHZNDycW1Jeq33VyaeLEH7UD0/fvACN 4rhW8H3CH8ibabDkfMa4wNlfSzN7OgJEsK3ta/qPlmQFjutlhDZh5XdwvgefdzM/4qCc Gu1/H4XQOjY/A67wyKmqnRgB1A3p+u7/RKkvVXePIw3+XMMoxREAvHIoZv8QTZsr7ZL4 u7CzvH5m34k4sS1u+yFR8ytw6JCKdLc/IdOsp+aiw3v7eDKBhyJMbU13tJzbDgzWV17z YDSGmbB4GEp07zwyV9sUKqqMH0ELvGCJIrKv7WKUyP4Svko0DG/cYh445vcZuVGIz7Bc mehg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:to:cc:from:dkim-signature :dkim-signature:dkim-signature:arc-authentication-results; bh=k9+VML+3hGdcGv5k99/CO2jptGBiwq8r6jj7G5dVL+E=; b=It0nmQi5mKxskPLH7WQV2OMqFsezvYtTq2lClC5ayho+aYjzjz3vktzM3lz+YUtbNg 4mCXic04k+5Gh+cyhfHwlK56GRGexBoaWT2pZNiWIoz3xDjlsLbGbdnmqWF8kZNYe3lJ g9Y7Nc6L2zmIkdUDQWGGh+IEXVSaa7wixYrPFP0edmZaBlgJANJgZpGR3p7ZzOUDlDgX TsGPzyGcLHPrmZO5klhwO6EwPLtzJLVGgdiS8CAv+KUnkOWrrLZcz/Z5FdkjrHgc4qCD vP6qw5JNCro6NBMb+GXwfEqDhYdZAn3kM0LFHOScqaL9L8Jb6pxCRDI6iRwSzFG78PoP 2Law== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@verizon.com header.s=corp header.b=QmzPyEHz; dkim=fail header.i=@verizon.com header.s=corp header.b=e2jNTspr; dkim=fail header.i=@verizon.com header.s=corp header.b=AHb/X/a7; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p11si7031354pfl.325.2017.12.02.08.12.25; Sat, 02 Dec 2017 08:12:25 -0800 (PST) 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; dkim=fail header.i=@verizon.com header.s=corp header.b=QmzPyEHz; dkim=fail header.i=@verizon.com header.s=corp header.b=e2jNTspr; dkim=fail header.i=@verizon.com header.s=corp header.b=AHb/X/a7; 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; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=verizon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753121AbdLBQMX (ORCPT + 9 others); Sat, 2 Dec 2017 11:12:23 -0500 Received: from fldsmtpe03.verizon.com ([140.108.26.142]:1751 "EHLO fldsmtpe03.verizon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752676AbdLBPx2 (ORCPT ); Sat, 2 Dec 2017 10:53:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512230008; x=1543766008; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Rgjih2Wk/iqEdkF+5SGh8QJ2RClodF2UQm2IPSKe+cc=; b=QmzPyEHzRB9GTWP7o5gsE0OOg8GyTKq5CaNIeLR+ZebMgq5RbGCEwOex WEL1tBotgRoo7tPxRqNudnwIlkgyLGBg9h/rt0CN+8RFT2T8taqj5yusc 6BW0NWARiaPTt3Vk59NqlXyGFM2lfGO5w3q6VZPM9c/8AXgqg8s8YNqA5 0=; Received: from unknown (HELO fldsmtpi02.verizon.com) ([166.68.71.144]) by fldsmtpe03.verizon.com with ESMTP; 02 Dec 2017 15:53:21 +0000 Received: from rogue-10-255-192-101.rogue.vzwcorp.com (HELO atlantis.verizonwireless.com) ([10.255.192.101]) by fldsmtpi02.verizon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Dec 2017 15:53:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512229989; x=1543765989; h=from:cc:to:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Rgjih2Wk/iqEdkF+5SGh8QJ2RClodF2UQm2IPSKe+cc=; b=e2jNTspr3L04XoJetwkfMkHDW5LQi6jiZlauk11IMBHgfmp6mosVkL29 l7daXD09iKpoESZRO8qK03jToBZAXzyGpd1PdBsUbkzrPuJrx4pIKDpDp 6AcgWhVVo+swFb50Hfy9J08WkUTFvMpvny1f65RlHEoCFAGcj5Ji8Ozcm I=; Received: from endeavour.tdc.vzwcorp.com (HELO eris.verizonwireless.com) ([10.254.88.163]) by atlantis.verizonwireless.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 02 Dec 2017 10:53:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=verizon.com; i=@verizon.com; q=dns/txt; s=corp; t=1512229989; x=1543765989; h=to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version:from:cc; bh=Rgjih2Wk/iqEdkF+5SGh8QJ2RClodF2UQm2IPSKe+cc=; b=AHb/X/a7vjB/9AIWMB9lyywgT4V4pDH/JRe7/UtmqRpqg/WIpV+I1ts3 vguYZxclk3OUqf+vctT8KS7dR+raTAqmnXcMcqkamI54DRTt1pEyUr+XQ vICw9Anf+goo7F9LGK7EHYFli4Cw8iYINbZSgwW6aS30QBmZPUCh1WcCd Y=; From: alexander.levin@verizon.com Cc: Masahiro Yamada , Stephen Boyd , alexander.levin@verizon.com X-Host: endeavour.tdc.vzwcorp.com Received: from ohtwi1exh002.uswin.ad.vzwcorp.com ([10.144.218.44]) by eris.verizonwireless.com with ESMTP/TLS/AES128-SHA256; 02 Dec 2017 15:53:09 +0000 Received: from tbwexch21apd.uswin.ad.vzwcorp.com (153.114.162.45) by OHTWI1EXH002.uswin.ad.vzwcorp.com (10.144.218.44) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sat, 2 Dec 2017 10:53:09 -0500 Received: from OMZP1LUMXCA12.uswin.ad.vzwcorp.com (144.8.22.187) by tbwexch21apd.uswin.ad.vzwcorp.com (153.114.162.45) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 2 Dec 2017 10:53:08 -0500 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com (144.8.22.195) by OMZP1LUMXCA12.uswin.ad.vzwcorp.com (144.8.22.187) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Sat, 2 Dec 2017 09:53:07 -0600 Received: from OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) by OMZP1LUMXCA17.uswin.ad.vzwcorp.com ([144.8.22.195]) with mapi id 15.00.1263.000; Sat, 2 Dec 2017 09:53:07 -0600 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: [PATCH AUTOSEL for 4.9 22/33] clk: uniphier: fix DAPLL2 clock rate of Pro5 Thread-Topic: [PATCH AUTOSEL for 4.9 22/33] clk: uniphier: fix DAPLL2 clock rate of Pro5 Thread-Index: AQHTa4WLBMba4kclrku6gwqVBNIulw== Date: Sat, 2 Dec 2017 15:52:24 +0000 Message-ID: <20171202155204.7691-22-alexander.levin@verizon.com> References: <20171202155204.7691-1-alexander.levin@verizon.com> In-Reply-To: <20171202155204.7691-1-alexander.levin@verizon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.144.60.250] MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada [ Upstream commit 67affb78a4e4feb837953e3434c8402a5c3b272f ] The parent of DAPLL2 should be DAPLL1. Fix the clock connection. Signed-off-by: Masahiro Yamada Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/uniphier/clk-uniphier-sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 diff --git a/drivers/clk/uniphier/clk-uniphier-sys.c b/drivers/clk/uniphier/clk-uniphier-sys.c index 5d029991047d..481225adef87 100644 --- a/drivers/clk/uniphier/clk-uniphier-sys.c +++ b/drivers/clk/uniphier/clk-uniphier-sys.c @@ -98,7 +98,7 @@ const struct uniphier_clk_data uniphier_sld8_sys_clk_data[] = { const struct uniphier_clk_data uniphier_pro5_sys_clk_data[] = { UNIPHIER_CLK_FACTOR("spll", -1, "ref", 120, 1), /* 2400 MHz */ UNIPHIER_CLK_FACTOR("dapll1", -1, "ref", 128, 1), /* 2560 MHz */ - UNIPHIER_CLK_FACTOR("dapll2", -1, "ref", 144, 125), /* 2949.12 MHz */ + UNIPHIER_CLK_FACTOR("dapll2", -1, "dapll1", 144, 125), /* 2949.12 MHz */ UNIPHIER_CLK_FACTOR("uart", 0, "dapll2", 1, 40), UNIPHIER_CLK_FACTOR("i2c", 1, "spll", 1, 48), UNIPHIER_PRO5_SYS_CLK_SD,