From patchwork Thu Aug 30 18:01:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 145553 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp195839ljw; Thu, 30 Aug 2018 11:01:17 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYLJ7E0rld8U67oh1slNnq5BcibyoY00GPgquzccXSttw2OB3nBz9ib1wNS2WoRQiDY9bbZ X-Received: by 2002:a65:5288:: with SMTP id y8-v6mr10766038pgp.284.1535652077103; Thu, 30 Aug 2018 11:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535652077; cv=none; d=google.com; s=arc-20160816; b=zRtBFXuu7inooDEfYkzuds2jKHLy2CNHgO+blAOAmUz9wpOWFGCRN7iQQQ/mzaQOPp +bFWpBkfOyiNhZ52iceRcfdNnuliNaSb/QE67N+qBc1brAqyeus4fX9oBPhsSc5JXGk7 hrleLQH35jWbHojyS55uhsDwG7g43T3ZWP683O5eBrYpBiFCDZGkjBRLAuX49qA11JvX igmjJ31Ge++RjaJMgKPwlUwhdBIaiApCCHF/21mU63CYyQ8fpmYiwu0X4aZIIBFt0y0C sVioeYx5oxElGHXbX1sGsCrXpgOs2CDS4meznq8X2iT2dNVE55qD9evpGPkcRagf1eXX fWAw== 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 :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=SB09djoriHEeyyZLPKR1IU15DTUWw8x1Xn8o/GZfmW8=; b=pAO8venlUQMTaoQ5C5AChy6jXnQeYs3PeIUdAo5FKAaeZqsnvA+vYsrCpTxHLbf689 3VuC/Sn8SyIheKdh6vnk/QI55saM4txzFdX2s23cvfGaacCvc9/rgHC+GS/uKhNJjgIR PapeSkXo57odPQWZn9YO3mAR5POPgHPzpeJ47hrHmAOTegl2OtXaRp+9RBANjsFDUV4C gx+SqeNNXrSNZv8pa8hZMhklot6gl6g8MCgMfQCtgGyscl7ewV5LS7m5jZMZw6/gQ4Q7 CsnMUkk6FDs73zmzgzxt3UooxzP1MPFf9PlEmAKveMjO174lgAlB8QDodU8UELZcZLao 0NPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b="Z/AWs7Cg"; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a64-v6si7831055pfb.224.2018.08.30.11.01.16; Thu, 30 Aug 2018 11:01: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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b="Z/AWs7Cg"; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725836AbeH3WEf (ORCPT + 13 others); Thu, 30 Aug 2018 18:04:35 -0400 Received: from mail-eopbgr690114.outbound.protection.outlook.com ([40.107.69.114]:18358 "EHLO NAM04-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726674AbeH3WEe (ORCPT ); Thu, 30 Aug 2018 18:04:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SB09djoriHEeyyZLPKR1IU15DTUWw8x1Xn8o/GZfmW8=; b=Z/AWs7CgJPk66S5xtrjv7/uz+c7agEXSOQLXM9aB81TL4ZCc9JIODBO8Szz8sTa7wL9GV8upS6lj0RpHh3BjO4cqA/REIGvcCQqXPeKUuXbetM4J19FDdp8NmmkCHVd5L3LxM3UInkhibms/S1LMZ/bDFxIdenQxQhbkee+lqaw= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0165.namprd21.prod.outlook.com (10.173.192.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.2; Thu, 30 Aug 2018 18:01:12 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611%7]) with mapi id 15.20.1122.009; Thu, 30 Aug 2018 18:01:12 +0000 From: Sasha Levin To: "stable@vger.kernel.org" CC: Arnd Bergmann , Ganesh Goudar , "David S. Miller" , Rahul Lakkireddy , Alexey Dobriyan , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.18 006/113] fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds Thread-Topic: [PATCH AUTOSEL 4.18 006/113] fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds Thread-Index: AQHUQItwG1tsI/zpdUCbk4OhQAzIMg== Date: Thu, 30 Aug 2018 18:01:12 +0000 Message-ID: <20180830180050.35735-6-alexander.levin@microsoft.com> References: <20180830180050.35735-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180050.35735-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR21MB0165; 6:vLn4JkpGmPD7u5Hf1rAiJG8ob/e8UVHtfrDIqzef5J+VvQPvlypxZ6fueVbCrdAphh/xixa1FFEtMhu+5PWEcqwvO3VmMYMz1b1C6+hmUXtOJkJtPDYkMHqMgRr70B7uDHtbrTZ+te1qBDFHKaElIHjK9lbXoNJPy18+ePp0YVuiAK2Y30F55iR1G8SQ0hGJOMLR/XJBUwNCNFyZZqZSaIwts8oC8B1BX51YdLdHhwRl0Kw/Q7HVQbvseSaYHBtbKhansZpPLU22zixiZpyERzcYEikEG8dkMfFEHY7qG60VP9RIQkxjMfkNY8kdaYnKWBOqIRSxjh69K55Ky8eZeMGMTXWf03//LSVATgyH7EdyQrHedB+uliMv7iM1o0yCti+h12/NvdgLsMrR+6ycleGyx/BeamAsNNXwsFSUV+Pfo5pHKJ5pnnNe7cD+paJoXv/Izuki/UNaxOQhoHJB+A==; 5:aW25qyqCXbK6fSIhUsnWgQ3okKgHlr+awsaU8z4xToqUPrZefmf5tBxvQ8H/poYRlY8TeVDp+cOisYglSGwEizORm2Xt9P4dp0PsdjnfLF1hlfygBNCrzAv5LtC+NKXph8ZbcQTnYnhcd9gcLjQYuiClJaZvcRrTOFJx9AogbVc=; 7:HLK+Va2eYM+6/xTEoqRIBh6DGqS/cPKh+TEt2qLXuKUfUE8MQbPeYn6usGUSMwu14RPb7yqhpNLW22gEROO06z0aavAgRhGVC3iXLiHe2CfE6OG4xSAjVQ1dkgwDILy1zm7UtQxydj2utN8zEhOnn73epv6wuPR2+2DdRwIpiO8HcC1Hr+GKpP5YeH680F+DObWnaJP7I4EYG9gfCtERNLvw6OIgkMvKHGiqaaFGG3RYUvY8Ia02KhKuDNHUHLxJ x-ms-office365-filtering-correlation-id: 123b4158-f7d1-4f8d-90c8-08d60ea2929a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(4534165)(4627221)(201703031133081)(201702281549075)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0165; x-ms-traffictypediagnostic: CY4PR21MB0165: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(42068640409301); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231340)(944501410)(52105095)(2018427008)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699049)(76991033); SRVR:CY4PR21MB0165; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0165; x-forefront-prvs: 07807C55DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(346002)(376002)(396003)(366004)(39860400002)(199004)(189003)(14454004)(1076002)(14444005)(966005)(256004)(316002)(3846002)(6116002)(2900100001)(99286004)(10090500001)(54906003)(22452003)(8676002)(486006)(102836004)(97736004)(476003)(107886003)(2616005)(6506007)(4326008)(25786009)(26005)(186003)(217873002)(72206003)(10290500003)(76176011)(478600001)(39060400002)(446003)(11346002)(8936002)(81156014)(81166006)(68736007)(106356001)(2351001)(105586002)(5250100002)(575784001)(2501003)(86362001)(2906002)(36756003)(1730700003)(86612001)(6916009)(53936002)(6486002)(6512007)(7736002)(305945005)(6306002)(66066001)(5660300001)(6436002)(5640700003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0165; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: FZt3I403ySu9SETjES60CkgFslF36yEfiL2Pa0SAqv5vCgr9EXwXXMEob/V/LRIjH3rt10kizgRm8nPIIe44sa5juKDOz6mdc4eF3qxmAc7rG40CgsyB51fNGBfAzmMTLIoP04qyIo7GdYrHRHN2c4ws7yp/8pHaZkiR9cQZfPTsLJfQoJbqPe6hUblCPFz8VE22NK91U7u+noIYD5Gf+10ebp3rHkSfYsv8Iuf2m14a9r9kP5XKencEQEGf2DIoM21DlhOU7j8GcLPcwCpJllWhJEfeNsR2JOveBgmf5fCGPNEd9ErT7Y/Voj1VvZ10Y8oFuhz9MbZzkD1IVSWTSwp8Kjv+MlZilhCCxiiyav4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 123b4158-f7d1-4f8d-90c8-08d60ea2929a X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2018 18:01:12.5436 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0165 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit a2036a1ef2ee91acab01a0ae4a534070691a42ec ] Without CONFIG_MMU, we get a build warning: fs/proc/vmcore.c:228:12: error: 'vmcoredd_mmap_dumps' defined but not used [-Werror=unused-function] static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst, The function is only referenced from an #ifdef'ed caller, so this uses the same #ifdef around it. Link: http://lkml.kernel.org/r/20180525213526.2117790-1-arnd@arndb.de Fixes: 7efe48df8a3d ("vmcore: append device dumps to vmcore as elf notes") Signed-off-by: Arnd Bergmann Cc: Ganesh Goudar Cc: "David S. Miller" Cc: Rahul Lakkireddy Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/proc/vmcore.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.17.1 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index cfb6674331fd..0651646dd04d 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -225,6 +225,7 @@ static int vmcoredd_copy_dumps(void *dst, u64 start, size_t size, int userbuf) return ret; } +#ifdef CONFIG_MMU static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst, u64 start, size_t size) { @@ -259,6 +260,7 @@ static int vmcoredd_mmap_dumps(struct vm_area_struct *vma, unsigned long dst, mutex_unlock(&vmcoredd_mutex); return ret; } +#endif /* CONFIG_MMU */ #endif /* CONFIG_PROC_VMCORE_DEVICE_DUMP */ /* Read from the ELF header and then the crash dump. On error, negative value is From patchwork Thu Aug 30 18:01:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 145554 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp195886ljw; Thu, 30 Aug 2018 11:01:19 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbWSlAmO/S3ciW0o8yo2m1p86e/2vUjN1RII+8f4OOSpar6NiZrv0Fif/elEBQhts5V1v0V X-Received: by 2002:a62:6948:: with SMTP id e69-v6mr11539664pfc.166.1535652079099; Thu, 30 Aug 2018 11:01:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535652079; cv=none; d=google.com; s=arc-20160816; b=NNBouBMLJwo2114Y9zv9mK3A6PHrcQdL6KW0BnmheszV4Uf3xEyvJMKoBWJIKZAr+9 5rZbSAdcMAbgMZREkr91LjdwVMiQEEGUbpQXpQ8zGI/KgraV4sPed4Wj/FB4JQZOi8iC LphH+KhbDZn6HA/k7B1QDea56tbSqmgFpCl0PFqOy29O+H4/nOPNrdR1Mad0cNgncdsk gs2YSpbOtexileb3dgtzCTOxn3khzNTonrVd1YKqycUgM2xNrEJAbtjkOUIT2Ud71aOn 4HqCuOVrm/7o4BMUSXE43jQFmZyfWelAsLClLSUcU7IqVAUofCeww/wWhpNcIRWBB9+q Q2Kg== 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 :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=jMWNRMalTNygT89NTuUWf890BsY9IaGRvgN8TqvDb1A=; b=M1oi7ER2423loDMtFI6XiXMxrXsR972gQFHDvLSGdJ2VcG2LPr5B1bnRuRU9EUuJHX Ggbnhv3UqAQ5gT/7lAAWdI5HwJCbBxdi4cQ1goI7baOppCDZyqICaTa9IXUk1u4XfzeH TKkGJo9vO3PBMqEVIp75lmAzTXU4d5mVCO1gXVL67Fcyw0cJhyBXPGav5H9R2e+DZ8h/ DV8dMsHCt7XLmWw3q5pm2Cm6umfNUcAWa/bYsKa1gAs/JxR8JbOtd2rGNfynU3U6GWKB PVMzGjQfFyHAwk3Pi0lP7dXc8EnQhDxdgU19Je+T4Xb+mn5+tFVexfDuUOnekyjVVYWP TTug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QaK480Fl; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a64-v6si7831055pfb.224.2018.08.30.11.01.18; Thu, 30 Aug 2018 11:01: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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QaK480Fl; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727227AbeH3WEh (ORCPT + 13 others); Thu, 30 Aug 2018 18:04:37 -0400 Received: from mail-eopbgr730114.outbound.protection.outlook.com ([40.107.73.114]:49585 "EHLO NAM05-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726674AbeH3WEh (ORCPT ); Thu, 30 Aug 2018 18:04:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jMWNRMalTNygT89NTuUWf890BsY9IaGRvgN8TqvDb1A=; b=QaK480FlhNpxX8aai69AhnMTDmKdC15CnWHiw3ecHg3ZG4+ze4OhF1jqmtPWVA4zL3mClBbSQIDoIGGNUEEShZCjulPr6BpxtB+Gfyuymb9J2SzVTIww/5wQbx/t4jFe0nanCb0D6BOBHRdvSskJdrltTMZAM73sv1Ely9lzaGA= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0856.namprd21.prod.outlook.com (10.173.192.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.1; Thu, 30 Aug 2018 18:01:15 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611%7]) with mapi id 15.20.1122.009; Thu, 30 Aug 2018 18:01:15 +0000 From: Sasha Levin To: "stable@vger.kernel.org" CC: Arnd Bergmann , Jan Kara , Jeff Mahoney , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.18 007/113] reiserfs: change j_timestamp type to time64_t Thread-Topic: [PATCH AUTOSEL 4.18 007/113] reiserfs: change j_timestamp type to time64_t Thread-Index: AQHUQItxE38ruvorcUSSvXC1VWNxhA== Date: Thu, 30 Aug 2018 18:01:15 +0000 Message-ID: <20180830180050.35735-7-alexander.levin@microsoft.com> References: <20180830180050.35735-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180050.35735-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR21MB0856; 6:DQtcEpztWqOxgcEUVKv017wacm4ioOOo1yZEKTDLV2Ru2QooLqONk7QdwgRpvtSv+z4eo9mIF1E1RDReCZpxDSYcyqHjLGVG8+mec5m2l0DSSl0sy+pKNs7LSV4SX5bLFxESD95EN46sMHdlMMAXgvUj5CFLdrhIHwNM1AxrHFtjfTEWoT4OS4KzVl62XRUjd/kQzWeU2sbmHAlLJyLmewDU1psJOFyyqxBd7HOXFChUJag71tMfb98cUsPFtjC7l5gNQSwrJuUhRAKIK9PblzPqnQ5/6Ou9uYFm6sWE5VRgVqYOrSBic9+/0GpfmVqmrRYTP3fhSmXmTaGFVQFof1JeCMjwcaXi5K228+Z53gXTZfC3smbxMbAzAGf9kEofUo+xsFSzPwGWRArukzWQ1Zsk3OjY6FGcZpRnzkgIFFx5uEcH52qKd5OSfjFml8kJerSFueIolwgQ6thOZP9kLw==; 5:AEL0HoqtaB9SbSDbD15eUTDFJRe0wxDGQ09b9D0JXpJIQaQnxMw6zd25enbfjscIqTRZlAHJeoVQr3c03xy67YeIYRorqift21MXFcVRaIkmBmKy0znJ55N4VDEiZ/8icHD5iSwdIEMtUTy6hUCcXEauvrCG0YfVe3XVAgS6v1A=; 7:gUQ+xdxflS69IjPAtS23rwBHWmjlC4ooUR3yTbHSqJaNh6OPrkzOuA5SzzXYnzxDTqJMlZqXUCtpKR6yviIfg0bq/Zp38uYcO9Tr9RjKjPofmIB7LtCXnNG5sztTdxwDsUjbZXlPwdNYgqbbLLnYo4Neow/S5CEkfX+u3ETbJTQM3Wm9Lw/DwIGFFnX9+X/QZ0XVWxOu9EEgJP0Ap8DQ68/ejJraDoEO1nngNwfDn1Ahi62IU4mkj8JQrUe2xCeH x-ms-office365-filtering-correlation-id: 9ce28514-6793-4c40-beaf-08d60ea29420 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(4534165)(4627221)(201703031133081)(201702281549075)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0856; x-ms-traffictypediagnostic: CY4PR21MB0856: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(42068640409301); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231340)(944501410)(52105095)(2018427008)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699049)(76991033); SRVR:CY4PR21MB0856; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0856; x-forefront-prvs: 07807C55DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(376002)(346002)(39860400002)(396003)(366004)(199004)(189003)(10290500003)(14454004)(86612001)(7736002)(305945005)(4326008)(478600001)(107886003)(575784001)(86362001)(72206003)(966005)(25786009)(2900100001)(76176011)(99286004)(22452003)(316002)(54906003)(2906002)(106356001)(3846002)(5660300001)(8676002)(105586002)(2351001)(81166006)(81156014)(1730700003)(6916009)(68736007)(14444005)(256004)(217873002)(8936002)(6116002)(1076002)(6506007)(102836004)(36756003)(5250100002)(2501003)(186003)(6512007)(26005)(6306002)(53936002)(486006)(476003)(2616005)(11346002)(446003)(97736004)(5640700003)(6436002)(10090500001)(6486002)(66066001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0856; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 82A+oGe9Yiwiq0oEJAwS34VKRK5KmUHUt4BaengDux+gA18GpGWR7M+LFnkATtECJmpq2OZ8jDVrIS9oFPr4qONrzFoxlTj9ygitdCm5NZYDvCON+mv/1H9abZ9V141NKARPJNOEGooHTYwep8F2Mk/NE8N4MeXJ1GeXK3GR6NitM08x+9HsLuVBkNCpcxOAlbzO7GbGMDTyfWxZHGUh4s8y8T4czJaKtbcFusbAYt5vw7oTkigepdw5LALi8l/b71yCnuFOqahnGPk+K28t4JkXwuhZw60SEbl7pZzX90aqNDAY/8QuoQkauHLwjTYDNujikSNLAc2TlJS+2Dt56VhaU/BFeJI0vzKQhRgBP2s= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ce28514-6793-4c40-beaf-08d60ea29420 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2018 18:01:15.1117 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0856 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 8b73ce6a4bae4fe12bcb2c361c0da4183c2e1b6f ] This uses the deprecated time_t type but is write-only, and could be removed, but as Jeff explains, having a timestamp can be usefule for post-mortem analysis in crash dumps. In order to remove one of the last instances of time_t, this changes the type to time64_t, same as j_trans_start_time. Link: http://lkml.kernel.org/r/20180622133315.221210-1-arnd@arndb.de Signed-off-by: Arnd Bergmann Cc: Jan Kara Cc: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/reiserfs/reiserfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h index ae4811fecc1f..6d670bd9ab6b 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -271,7 +271,7 @@ struct reiserfs_journal_list { struct mutex j_commit_mutex; unsigned int j_trans_id; - time_t j_timestamp; + time64_t j_timestamp; /* write-only but useful for crash dump analysis */ struct reiserfs_list_bitmap *j_list_bitmap; struct buffer_head *j_commit_bh; /* commit buffer head */ struct reiserfs_journal_cnode *j_realblock; From patchwork Thu Aug 30 18:01:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 145555 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp196570ljw; Thu, 30 Aug 2018 11:01:49 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbM4cJ/q2HdLVfGMOGb6GhxEl0C0V2082S5C8YpjKjAqm366AJZR+8yfn+fARu+ynQx3nhD X-Received: by 2002:a17:902:b03:: with SMTP id 3-v6mr11158740plq.277.1535652109620; Thu, 30 Aug 2018 11:01:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535652109; cv=none; d=google.com; s=arc-20160816; b=dwRlwfZ8Q4LP+yGD2u+L4Ju3xpLi73inrTBi3OLJmRiyv3x0HlzmnP9566EXB5jans YmDL1ONjuDr0hjeqt0OZQe16LDfGJS28PUxFSSBlDAWVIlGisu9pwezs/3HMNUsGhR3v M0ERbdpTpZtxwkV/xn8TbdpwAccMFfYQ1HdTT9ZUAKVQXdJ72ql7mt0YcrGA7CN1mnAv l2VPEpKgIlRbLSa7B05QL0yXrV4YDutYftKrRk0GZs7p30+3HgeRQqmwvPEMhScQye7F Rn2hNi0LfUidIriYVIsn6WtLDq9qS8uYOAJ/4ikwAG5hfh0jX7uIWXeoxLipfkJBhxVX lt+A== 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 :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=/yODuDzt1l0pCzHWp3JyfMBOwzEkfmxuu8Lalhxj4wA=; b=iPO4goVPRhdFEcI6Q5NXMYE/u0ZJvLv2fVS31IOyTS3lPGAHD6OkBFNCgds1T9JKiv Z3QnsU6Zbj9d8rmTjufy7/pDhwdanXelv1IwBpB2d7Kktq6RsY/GWnI5cNoc5n1vCvBI dr2qLZIsGyvplhv8gR6OezINAaWD80Zlt7eeEWZetzR3rkdNMvtny34Npm/c6M61n2l6 fHlAu+m0L9StqxXxIXOrJcEEEsQ1bwDRqS9b67idzx4qmjEqUnh+ltIZUiHOks9RCz6p ZE+DFVizffyr0OBSYamlAVggbeyYQTtx5beMfQsZwuaDE7zIuEhr5/SWU/1N1WtrvLE4 8apQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=aEevyAWl; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a64-v6si7831055pfb.224.2018.08.30.11.01.49; Thu, 30 Aug 2018 11:01: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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=aEevyAWl; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727340AbeH3WFI (ORCPT + 13 others); Thu, 30 Aug 2018 18:05:08 -0400 Received: from mail-by2nam03on0132.outbound.protection.outlook.com ([104.47.42.132]:33758 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727338AbeH3WFH (ORCPT ); Thu, 30 Aug 2018 18:05:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/yODuDzt1l0pCzHWp3JyfMBOwzEkfmxuu8Lalhxj4wA=; b=aEevyAWlM1En85YFwHdpTNknzZyFQBBixD6PbV2uBQ4Cc16117MjdooKSSkmCUeMAL1QMFOh8OrPt8gslzEjAaldOx0izxdNQh/ZXMNxrEqHYAHDzGMZ+wduSCyJLpZkJa0Srijp6qAYCc3De1ecvIEZ9C2PgWBIiiRMvUTvRbU= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0856.namprd21.prod.outlook.com (10.173.192.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.1; Thu, 30 Aug 2018 18:01:46 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611%7]) with mapi id 15.20.1122.009; Thu, 30 Aug 2018 18:01:46 +0000 From: Sasha Levin To: "stable@vger.kernel.org" CC: Arnd Bergmann , Thomas Gleixner , Nicolai Stange , "H. Peter Anvin" , Greg Kroah-Hartman , Borislav Petkov , Sasha Levin Subject: [PATCH AUTOSEL 4.18 019/113] x86/mce: Add notifier_block forward declaration Thread-Topic: [PATCH AUTOSEL 4.18 019/113] x86/mce: Add notifier_block forward declaration Thread-Index: AQHUQIuEEenFU4Y5f0iePYFbccOJ2w== Date: Thu, 30 Aug 2018 18:01:46 +0000 Message-ID: <20180830180050.35735-19-alexander.levin@microsoft.com> References: <20180830180050.35735-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180050.35735-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR21MB0856; 6:Hx+cs86D6+4NsPshhPQt9RbHZL3UE+OItAxhc4Vd1Dgv/NPX6z8TZSk/S69W6brBxrqgykYPfbjHZeKUb60Yy2e3DK/cX92W7Jr+CZypCSQofZbxK/uMN/BWAVrru+1/FNdnDC2CoJjJzvuuB3N2zC7Go/ZR2uJZpkzie9apxVnQDSPsgBM4bdqDRgSTqUebOWM2e2BnOGqedXvfVoj2uXoU+j2jHsy+N2J8sdBjRHvNdirlmryprBAzwLbXp1oXNx+uXSEwTvP8qCkrMKNkt5EroqTO3xybCum9TQW1xw/EJrBj6bPy4WTxc0O4m/SCdtM9zhGRL6V2noMoyxtwKC+erNJXnH2XGzrS1987gGZwPKtNPUn/V3nMchZt35mXsJRk18t7Km8vXD2ThReSEdcptouoLvuejQBOgBAsvYxhE8IT3+Te+RDFhCd4XBCxfFv//4q/ap+Aq69qqizZCA==; 5:388WRZEKTVT0fchza1jPAGaHUDROXXwfYSYoEBb6zAm2I9z9SS/5CIsWHa5nj57ycJ0Iz1n5R8mXVRL6cVqz4LiFbdz46D/qGfE71tNMZG7j6GeZNT7kifZGL689QS9nLZww4quSx1gCgQ3c6cqIeFRg6Ht+TaSgeKkTooeMy6A=; 7:MMnY6XmsiIyIf6YYIGk0ue5zEdJCp4TEMApz5C0SKroBfOLfsfObphEPTk+EBVSASr7Sj2j1ocd0ed+BAGmJ5uiqgh8uw07VH+SPYaUenTCwD5h1agovkwpt5k2hQEgLn8ifc1OFKhnrCD3xa7+g8dL1niya/4a61aiMuOxkRsjmpIBp+6cSRtdYBZChqCA1E9gzlXEpY7GrSXBpfeqe+DIdycWBWssONB/2fh+gNElFbBw+QlegEVOY5PSteZUa x-ms-office365-filtering-correlation-id: 8fa294b7-bfb1-4d45-6f23-08d60ea2a694 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(4534165)(4627221)(201703031133081)(201702281549075)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0856; x-ms-traffictypediagnostic: CY4PR21MB0856: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(42068640409301)(17755550239193); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231340)(944501410)(52105095)(2018427008)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699049)(76991033); SRVR:CY4PR21MB0856; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0856; x-forefront-prvs: 07807C55DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(376002)(346002)(39860400002)(396003)(366004)(199004)(189003)(10290500003)(14454004)(86612001)(7736002)(305945005)(4326008)(478600001)(107886003)(86362001)(72206003)(966005)(25786009)(2900100001)(76176011)(99286004)(22452003)(316002)(54906003)(2906002)(106356001)(3846002)(5660300001)(8676002)(105586002)(2351001)(81166006)(81156014)(1730700003)(6916009)(68736007)(14444005)(256004)(217873002)(8936002)(6116002)(1076002)(6506007)(102836004)(36756003)(5250100002)(2501003)(186003)(6512007)(26005)(6306002)(53936002)(486006)(476003)(2616005)(11346002)(446003)(97736004)(5640700003)(6436002)(10090500001)(6486002)(66066001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0856; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: KNOKZBH7MTTw2jIwZjQTwZFq1DZeaASQFKdad6r9oTC9OBrsso3gR3ppQygBodylkw8rYeVBtKb52aP1+IC5JI2Bxo8aRKpqnrkna4UjgqDP/AadApRLyTBz9pYwfAW+GYDDV3s9GhhCkRzgYhHkK08QSJLcJh6dQPXYv5HEGhauDjU2qyKF+Lr+M8qUtQfpspuug/aqdbtVE5DnbNFhsKIWAHz3vt9i1idbSb9wmMQzcrUazu/IfXiXpUs2uAt/3UJyv5nOcaUuzCGq3YTW7qo0vkyWdlUTa/pd3MjXUDT/klHu/VQl4BVHCg6sMi29ozH1iUHPwwsz/cCcF2wg/gk3JyGcDHfPScn6x58bXxY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fa294b7-bfb1-4d45-6f23-08d60ea2a694 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2018 18:01:46.1430 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0856 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 704ae091b061082b37a9968621af4c290c641d50 ] Without linux/irq.h, there is no declaration of notifier_block, leading to a build warning: In file included from arch/x86/kernel/cpu/mcheck/threshold.c:10: arch/x86/include/asm/mce.h:151:46: error: 'struct notifier_block' declared inside parameter list will not be visible outside of this definition or declaration [-Werror] It's sufficient to declare the struct tag here, which avoids pulling in more header files. Fixes: 447ae3166702 ("x86: Don't include linux/irq.h from asm/hardirq.h") Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Gleixner Cc: Nicolai Stange Cc: "H. Peter Anvin" Cc: Greg Kroah-Hartman Cc: Borislav Petkov Link: https://lkml.kernel.org/r/20180817100156.3009043-1-arnd@arndb.de Signed-off-by: Sasha Levin --- arch/x86/include/asm/mce.h | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 8c7b3e5a2d01..3a17107594c8 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -148,6 +148,7 @@ enum mce_notifier_prios { MCE_PRIO_LOWEST = 0, }; +struct notifier_block; extern void mce_register_decode_chain(struct notifier_block *nb); extern void mce_unregister_decode_chain(struct notifier_block *nb); From patchwork Thu Aug 30 18:01:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 145556 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp196749ljw; Thu, 30 Aug 2018 11:01:56 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZfIGn+y8i8iV4cb6BHHvIKPfqlFU2b8iGQRwMLYF1swsw9l5P5el5JZ7ZW5/GKruT6bT87 X-Received: by 2002:a62:959a:: with SMTP id c26-v6mr11640844pfk.234.1535652116044; Thu, 30 Aug 2018 11:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535652116; cv=none; d=google.com; s=arc-20160816; b=mv0xqj6I/X6Mrr61jVRw0SZIvJajZfisHJrVJwpVgXWf6Fz2/1wNW08JpvhvhQ/UiL bGKmVFv4wicPxRUmPcUYmncbvRNBzLMeKl97hYGrJXd8u3LIcLBcBw/n/LrZi1VJg0AG hn/JJybcTmoMibLzY7uRgPade13GQBg2pGFOnwBkSV4x3GZyrGCREkZUAJ3NUMzErvRO ax9JG8Kauvig0eTzqv4IkMr1bskjrm0s40P9cF8+RUpEaEeAjo/iunz8EWX/hqkxMk/J Mv5oYGefwaecMfwcBpoAnbE0VP+aubXKkWepYV8Xg9sSsbiLaBZi197PHp+0+UCZ9ylF s7Rw== 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 :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=YP5Dxk17xnVTW+Q1iNbFLQFBh5qUjifSzo9LtuCBfjQ=; b=BuYzy2I48Bps5pZsRwPKPlw6QMtGDVnQed3Le0oedbkHrSUr+zH+IvUW4TW8aQ99al Z+R6e+3/npeSXhUn58pnGw6cXHcxIwmdP0D/nmfa8epx0EJifI+pXJAQEEyeuSKdDQo/ 8Qtvrys1IACrj+l3xksHPrRLLtuE7YiAukkES8NoKLNJqoET9/AF9tlHIUWRR0c7boLD 8SJBl5/spjbXZIYqDm0daqvKsCZzLgXT6n3tL0UzZAXH6kDMRUCvEkiqfEFk1X2MJHt8 XmI03Ojf8xFUionTHgFCGUqwjoGJu+HAzOGZTTKeyUWhjXQ5FDgdxb4DNlNyt4ipIdjL kfYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b="TGLn/kOl"; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a64-v6si7831055pfb.224.2018.08.30.11.01.55; Thu, 30 Aug 2018 11:01: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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b="TGLn/kOl"; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727338AbeH3WFO (ORCPT + 13 others); Thu, 30 Aug 2018 18:05:14 -0400 Received: from mail-by2nam03on0134.outbound.protection.outlook.com ([104.47.42.134]:34736 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727270AbeH3WFO (ORCPT ); Thu, 30 Aug 2018 18:05:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YP5Dxk17xnVTW+Q1iNbFLQFBh5qUjifSzo9LtuCBfjQ=; b=TGLn/kOlvkIe8g7UCk3byrHrphXISVGSs3OdCLF5DZcIYseRRr+V3p44VxFi5sxj6vjezn4WosqZB5WSsJangZnEOM4Mhn0J/S0sGXbh/83tnyP0oxbK/IKs0B8rpDCIcROVuRTFuAJla+DexpQ1LDCQe2YwfiowrWiMOgl14Tc= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0856.namprd21.prod.outlook.com (10.173.192.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.1; Thu, 30 Aug 2018 18:01:52 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611%7]) with mapi id 15.20.1122.009; Thu, 30 Aug 2018 18:01:52 +0000 From: Sasha Levin To: "stable@vger.kernel.org" CC: Jerome Brunet , Thierry Reding , Sasha Levin Subject: [PATCH AUTOSEL 4.18 022/113] pwm: meson: Fix mux clock names Thread-Topic: [PATCH AUTOSEL 4.18 022/113] pwm: meson: Fix mux clock names Thread-Index: AQHUQIuHv71lRxwPgkC2RmgyMuacqQ== Date: Thu, 30 Aug 2018 18:01:52 +0000 Message-ID: <20180830180050.35735-22-alexander.levin@microsoft.com> References: <20180830180050.35735-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180050.35735-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR21MB0856; 6:e3vu/0pKBxsOzNohBFe+zMmS3ZBffmhEjdijsFwLodDKJji/3Xz59T3PXrkuR8gl/cPixKpodvcRDsvI43cyW3ED/7tcTMP71LGrhBUEV6Zmmfqdh6AEtnzIEkbqcqYTxy1Xn+oyVb1kqoOmDXJHxmzV+3nvwYDkINmB36ISre+quRQeFUZAUykRe2CY8E0XnqtCUDWy6lXnWNQJpwS6anIeeMpaJUtK55JjnqXHm7cHTSIb47sFxsa1p7MtCv0ivmK9vSy/3kvmlB96JvBxTahkPxcuSisit0gD4JSu/0qhlAnYlE5kXW1QU/eaXtYJ1gf+ZZss6n3c3r/vvAvf2tWPttW1A1rMW0fX1Yq7/dSpxyeTOK7khGzTmlReQ9Wq3PmnDmz7ZG9kzu+nViqgukduhe5q9H0E94nHNZpJAaJu88lJwBZ4njhYszptouO5enTIUxMRHEJt3q/A0e0PLA==; 5:O2zg9WMmcUAq85LYVqpByjzQtUOjnpC2/qywivNezh5alBrqE2FRTxJrb3/SCvNAdfFTxwOxAErPIfCOnm99PGaXEmkV4QWVF1WE8H/rZC+bIdA+QZXj9sB7QFbr9smfywpPZ/G2UMdyYx1emJ0G5C4BgqmaRQUHMhQvZ+6Ty90=; 7:gjef4BpC7pmFW+ogURWv3qhO9Og9p1NaOZdJpIqUk1btXj86ZXPXBLcZuZOAiE+lVR6ouKoPvBt6JX6dLFLBreV/ctNInPtzOkyf2xjGdirFr/hmPMcSLxSuEr3RRdaLXOMPOHUak8F+iYLiYUU0pJTMugQeIjsYDgIIXABI4JGqf30+wGs3BEgYVqAQYK0l3wEGyj8bbDwpFo994Cv9DKH/4tVFtWwUd+b1pUtF68RVSxLdEoCHInt/9eVwQwI6 x-ms-office365-filtering-correlation-id: c19adff8-4bf7-4c6a-f294-08d60ea2aa1c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(4534165)(4627221)(201703031133081)(201702281549075)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0856; x-ms-traffictypediagnostic: CY4PR21MB0856: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231340)(944501410)(52105095)(2018427008)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699049)(76991033); SRVR:CY4PR21MB0856; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0856; x-forefront-prvs: 07807C55DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(376002)(346002)(39860400002)(396003)(366004)(199004)(189003)(10290500003)(14454004)(86612001)(7736002)(305945005)(4326008)(478600001)(39060400002)(107886003)(86362001)(72206003)(25786009)(2900100001)(76176011)(99286004)(22452003)(316002)(54906003)(2906002)(106356001)(3846002)(5660300001)(8676002)(105586002)(2351001)(81166006)(81156014)(1730700003)(6916009)(68736007)(256004)(217873002)(8936002)(6116002)(1076002)(6506007)(102836004)(36756003)(5250100002)(2501003)(186003)(6512007)(26005)(53936002)(486006)(476003)(2616005)(11346002)(446003)(97736004)(5640700003)(6436002)(10090500001)(6486002)(66066001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0856; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 73gFeKtIRp7RrL0n4hZuS5g983E+nokWPtklzl/2uBdJtlotWhrj6z/qRrdCm4V1hjaZnpTXjFeQKEygGg0VDtfg4cjLH+7WoIkWMAPPwoh92o1mPzxdm+P4oYeOTmr1vYuoB6uTCgoNF9p5xmvMHbHWhQzM+aGbPlnyhIT9G2tt6rqEZ7b3/rZ3VfOlFTnFyTOjvqnbb4pXZEY63xh5Cw0zlZAvFJafsbNTGWEvISsYdtrswLGI59su5k4qCG0DlSgOxZyA7FJ9RkdcAU3gwNub618lXbDcEjIn2oIRUWWJKqxP4iLguo/6g4sRMMnPx9ynlZ44USC9mSQdOZV0GZVwxVvOF5/yRdKn2Tq7mzE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: c19adff8-4bf7-4c6a-f294-08d60ea2aa1c X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2018 18:01:52.0778 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0856 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jerome Brunet [ Upstream commit b96e9eb62841c519ba1db32d036628be3cdef91f ] Current clock name looks like this: /soc/bus@ffd00000/pwm@1b000#mux0 This is bad because CCF uses the clock to create a directory in clk debugfs. With such name, the directory creation (silently) fails and the debugfs entry end up being created at the debugfs root. With this change, the clock name will now be: ffd1b000.pwm#mux0 This matches the clock naming scheme used in the ethernet and mmc driver. It also fixes the problem with debugfs. Fixes: 36af66a79056 ("pwm: Convert to using %pOF instead of full_name") Signed-off-by: Jerome Brunet Acked-by: Neil Armstrong Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- drivers/pwm/pwm-meson.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c index 822860b4801a..c1ed641b3e26 100644 --- a/drivers/pwm/pwm-meson.c +++ b/drivers/pwm/pwm-meson.c @@ -458,7 +458,6 @@ static int meson_pwm_init_channels(struct meson_pwm *meson, struct meson_pwm_channel *channels) { struct device *dev = meson->chip.dev; - struct device_node *np = dev->of_node; struct clk_init_data init; unsigned int i; char name[255]; @@ -467,7 +466,7 @@ static int meson_pwm_init_channels(struct meson_pwm *meson, for (i = 0; i < meson->chip.npwm; i++) { struct meson_pwm_channel *channel = &channels[i]; - snprintf(name, sizeof(name), "%pOF#mux%u", np, i); + snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i); init.name = name; init.ops = &clk_mux_ops; From patchwork Thu Aug 30 18:08:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 145557 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp204734ljw; Thu, 30 Aug 2018 11:08:47 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZjlMaD/yifOguldBecLLNOvm+I0M8vOWHawf2DqxeANrxnpvGyBS529GYnS26Ed0n22Kuo X-Received: by 2002:a63:af17:: with SMTP id w23-v6mr9406428pge.47.1535652526963; Thu, 30 Aug 2018 11:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535652526; cv=none; d=google.com; s=arc-20160816; b=iUfZaFX5PQiFMBaQq4c8eOD9cBo6336AvPon+UxGMqt88AmguNDBCs969pIyc6CFS4 NhF8mfxrh3+LQP1aS5wppCXMq8LudB30iG1/w2ajz66LgWp4/EaQZLhr1Kb1hPbcDp6d KcNeFCJZ9bg3ZCOJb10PUUD6C3D8WMCg9UnFVhgjTpch5jNHbrqt34KpEqaLs+63BvBL kY8e7WyCUp/Jbz2sqKpkXuKCbttaoa2Vwxpkw5R9nCYPEakTEhnJbo/wDtrH6i82A/gw yB2DQbSnAE9CiE6oOFNFqC34/v7WVhODdX9FMKIBGeyuWJ+mP9/61c3vXuCJEW88GNHt U4kw== 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 :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=0oGN5z5qlg5jVBl97nAjuCBDheCuQWj50IgZDOsiN2I=; b=UoPFN3kZOG5H2++RmEWGVBCTolvru4kICkxzgUt/rqEeyDEgj3yxXs3SD8yFTyzqWW yCrE9M8BPxnQzX68RCBTxYylFhWoEyatw+N1omomeU/hQtnd7KQW55iI9O+zcD87yxte nnCYKzlmn+JwCa5bNOIYNslTy/wjiyO96/rHwe/E4iA7ojr62YxvspM1DzyQ+JkhnoJC eT0NE0Phxb26NJ/F5HjjYXV/7Gm64ncjoAneBLVz9DGWkBYPknnP7jXWJuNPsW6jqvGN WJ7VLS3AwtDn5am0TjK+Wd4mp8r+Pamz9V5zuWJR03A4mRBFw9hU2a7MGq9MRc5i3+YM ja7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Dl0XLBh4; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a33-v6si7201561pld.269.2018.08.30.11.08.46; Thu, 30 Aug 2018 11:08: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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=Dl0XLBh4; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727665AbeH3WMH (ORCPT + 13 others); Thu, 30 Aug 2018 18:12:07 -0400 Received: from mail-bn3nam01on0121.outbound.protection.outlook.com ([104.47.33.121]:36753 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727340AbeH3WMH (ORCPT ); Thu, 30 Aug 2018 18:12:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0oGN5z5qlg5jVBl97nAjuCBDheCuQWj50IgZDOsiN2I=; b=Dl0XLBh4eaCQc3u1rvbTm1rpOCGbtAUtZ91WenXa+PRe6P/ikspSNa1Chj8GGAUfvPry0IO017h0AVU4AgseQwc9a60K55viEmdx8MrxFII3eyNVTIDtSV1DHXhlR4thk5JqaRu47Jq6Gnqb0MhU+Xr6dvmDlwQcJ5L7bgE+xlg= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0118.namprd21.prod.outlook.com (10.173.189.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.2; Thu, 30 Aug 2018 18:08:43 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::7c3a:eea8:1391:1611%7]) with mapi id 15.20.1122.009; Thu, 30 Aug 2018 18:08:43 +0000 From: Sasha Levin To: "stable@vger.kernel.org" CC: Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 4.18 097/113] um: fix parallel building with O= option Thread-Topic: [PATCH AUTOSEL 4.18 097/113] um: fix parallel building with O= option Thread-Index: AQHUQIxqVBzuopzRikiOEfn+HnbosA== Date: Thu, 30 Aug 2018 18:08:13 +0000 Message-ID: <20180830180714.36167-31-alexander.levin@microsoft.com> References: <20180830180714.36167-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180714.36167-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR21MB0118; 6:ZuRFkwBgW6HjO7ESOIzIkZonFBlO+ewGOSz0q3gudDq4e9p2PvB80Ub+MCFBDAX+d6YQ7MsaBGZItXRQZ0uucBPtpRL/IiqsD5pCHkaPkmXD4GhYZ04edE9aoueUYqnScS+g93E+c0fJ9WNLIsoCQDTg0NBXFbetv4nBdzXeFCSLwEfrtCaYyRV8HmneVinahze63hbXUZumCURNE5/vcUuMI2P1h+DKrFJ7H4cU4c9803wtvhsKgBVhcz+hzQyDW+N9+YWQz61yLIMU0NWDyl59+Z0OzE8oMj7/n2ngqIB6jWDT1cuCfV7NSwfvZI9K+KAok6ETsMlLwaFOdDKwxoYEWZQcgQ793af9C9NJc7nA7fpASplm3f79jD4DenyH3kYc4w9zwB+Je7cU0/jP3ErP964YD8m3WQZMmrklSVCXuBHUTgMDNr558fndxdbIYJlwGRoCOq7t3qCD8v0LVw==; 5:opcPGpwGvwScdGsMb6kJu0Iy6uZ73Hk5f6Qer2ZF8vRNmRmSeE5RjNQAIZDXsR63Po6RJMa9schB6n9jl+FMCXmddnDM9KVOOWDKOmMKNpDuD2T5Zy7PGNLKoZ/wWgcUU3ypV1rTe6SrThvRMbKbFppSvMfjYbacV3rJVldTPqU=; 7:8S5HlYTKePMZGr4ikbs2ZMWmu/t9hHZLG/MdK033t2m2wpvD3ErEwCaVb7Vk8EdnNdckJ7009DWaSwUgDvd6zzww3Ao6rmGah578xsBDxvxl634IWgBO0xZvTEvdIvFz4EtEBs5OxF8k55icWATLC78D8jEdFLr6xx2H9vSfb9isc5+UMoCOessA4QydRYQsksBUBG+dSY9pGCemLPwDgV0c2VSxUy3WuAEkQAAVzIc0dXp15MNkSLN1thegr26N x-ms-office365-filtering-correlation-id: 65989469-0768-4dd7-55e6-08d60ea39f2a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(4534165)(4627221)(201703031133081)(201702281549075)(5600074)(711020)(4618075)(2017052603328)(7193020); SRVR:CY4PR21MB0118; x-ms-traffictypediagnostic: CY4PR21MB0118: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(20558992708506)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231340)(944501410)(52105095)(2018427008)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(201708071742011)(7699049)(76991033); SRVR:CY4PR21MB0118; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0118; x-forefront-prvs: 07807C55DC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(366004)(396003)(376002)(136003)(199004)(189003)(5660300001)(6436002)(10090500001)(107886003)(99286004)(68736007)(105586002)(7736002)(106356001)(305945005)(76176011)(5640700003)(86362001)(25786009)(97736004)(22452003)(217873002)(2906002)(6506007)(5250100002)(102836004)(26005)(2501003)(186003)(4326008)(6486002)(6666003)(256004)(6916009)(316002)(478600001)(6116002)(53936002)(6512007)(86612001)(2900100001)(446003)(486006)(3846002)(2616005)(1076002)(8936002)(11346002)(14454004)(36756003)(81156014)(72206003)(54906003)(1730700003)(2351001)(8676002)(476003)(66066001)(10290500003)(81166006); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0118; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: tMyATNJTJMyiwjyc+e/lE4KmYLFq7S0Oke7EW/ul+t5ycYRY+Ndqa2KgAayDVWwRrFH+qhnX7fJfnkPwHeailwJbutCEw580h8QHWQ+Ec3lHsHO2KWt88/EvCizq0LRksp9eeHv6qa/IFlsfNj1+orRoO/+hexOVngfSkdIVi1+1ovjKfuG+i+gMpS5XKdGTUNrHcHVNe0/yolDQkw/nmLRGSjp+MJLd6EMsFG5KgDCzHbHqSnHPVDme6ugffpho2LfQ1G9cNC9Kiq/X3xLH6LSZNGQHgyPD5npGpimcYtY0xzgH8qITMpepjSKXmJzMgh97Yz9eBSMYqXThLIjox0Hh7K+8LtzmRgImbgtGNOc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65989469-0768-4dd7-55e6-08d60ea39f2a X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2018 18:08:13.1516 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0118 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada [ Upstream commit 13d3d01e26b942ada7cfced68ccb6db49597874a ] Randy Dunlap reports UML occasionally fails to build with -j and O= options. make[1]: Entering directory '/home/rdunlap/mmotm-2018-0802-1529/UM64' UPD include/generated/uapi/linux/version.h WRAP arch/x86/include/generated/asm/dma-contiguous.h WRAP arch/x86/include/generated/asm/export.h WRAP arch/x86/include/generated/asm/early_ioremap.h WRAP arch/x86/include/generated/asm/mcs_spinlock.h WRAP arch/x86/include/generated/asm/mm-arch-hooks.h WRAP arch/x86/include/generated/uapi/asm/bpf_perf_event.h WRAP arch/x86/include/generated/uapi/asm/poll.h GEN ./Makefile make[2]: *** No rule to make target 'archheaders'. Stop. arch/um/Makefile:119: recipe for target 'archheaders' failed make[1]: *** [archheaders] Error 2 make[1]: *** Waiting for unfinished jobs.... UPD include/config/kernel.release make[1]: *** wait: No child processes. Stop. Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 The cause of the problem is the use of '$(MAKE) KBUILD_SRC=', which recurses to the top Makefile via the $(objtree)/Makefile generated by scripts/mkmakefile. When you run "make -j O= ARCH=um", Make can execute 'archheaders' and 'outputmakefile' targets simultaneously because there is no dependency between them. If it happens, $(Q)$(MAKE) KBUILD_SRC= ARCH=$(HEADER_ARCH) archheaders ... tries to run $(objtree)/Makefile that is being updated. The correct way for the recursion is $(Q)$(MAKE) -f $(srctree)/Makefile ARCH=$(HEADER_ARCH) archheaders ..., which does not rely on the generated Makefile. Reported-by: Randy Dunlap Signed-off-by: Masahiro Yamada Tested-by: Randy Dunlap Acked-by: Richard Weinberger Signed-off-by: Sasha Levin --- arch/um/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/arch/um/Makefile b/arch/um/Makefile index e54dda8a0363..de340e41f3b2 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -122,8 +122,7 @@ archheaders: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ kbuild-file=$(HOST_DIR)/include/uapi/asm/Kbuild \ obj=$(HOST_DIR)/include/generated/uapi/asm - $(Q)$(MAKE) KBUILD_SRC= ARCH=$(HEADER_ARCH) archheaders - + $(Q)$(MAKE) -f $(srctree)/Makefile ARCH=$(HEADER_ARCH) archheaders archprepare: include/generated/user_constants.h