From patchwork Thu Jan 18 20:59:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125025 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp293822lja; Thu, 18 Jan 2018 12:59:53 -0800 (PST) X-Google-Smtp-Source: ACJfBouGzWb4hUW5dr/qfZRqPB/8yl5RnMWtrjBWrs5VBD38EI0wI7An3T+TkQPWJkDREGXO0fT9 X-Received: by 10.101.97.145 with SMTP id c17mr38217810pgv.289.1516309193271; Thu, 18 Jan 2018 12:59:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309193; cv=none; d=google.com; s=arc-20160816; b=Og6NyWjBBb2XuJ3WKeKizO/Etv8dCQ5cy4H++3gLk3RhiC/TaihxigzWwd2NjeP02a /OStUc4Ay0EoKOO7fgCaHxe1FX+VDzLEX6U9STLDH5q+HQ3AvuIUOwXVirIAJ20m/lK8 a72sWe1KInwpyi3wGh8SiUvlSM5c3HZHAspJIh7j3+Fa2m0NZz6mQ8gmLh7e8s5lwKHb LuwYV6GAXkNTbuCcbzM0XwK91g2+BOdCGSjajX1XMm9XXGcoVzYBBUETW4BNnIFmtBeo 2byszBzIcArII08SaC5w5AsjuSBruSTxtB9LMIHV9eghDni+Xla13sP7BR57KXcXshHR FTnA== 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=wwn7QDYVzaUOFGBvcjbKcGYswHCatSIntYoT11CyJfw=; b=nhiYWQtTzis7y7Ftl2Vy64XC60RyiidJF1A00fao9cBrrh5OkbLkYdXWY3HMLdYILa Wt/tVziHggL2+3bgNbmdNXnfJFLdCYHZ4c6TwsxNX1aqDvLZHV/1OG/QL78L3idOyhX0 F+72VCR2DnWRR6SouKqflE7aoGaG1xak7fSxtQmyCkufSgTdHxaedHwj2EvCQcW+QB9P zQCd96Sjxyw8v4rbWmtsxexXnYH5wP+31iOuRHuhTwq+DE6HTlMJlTeFCVFMwBTY7WW5 40NgW2JRbyFlscWs5V2JOHTW4OqSX2yXt6dU4kNnug5nKzAJHMN9CUkI/ICqxWrRi8sK CoiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=HNbUhtMG; 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 c16si4933770pgu.706.2018.01.18.12.59.53; Thu, 18 Jan 2018 12:59:53 -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=pass header.i=@microsoft.com header.s=selector1 header.b=HNbUhtMG; 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 S1752100AbeARU7u (ORCPT + 10 others); Thu, 18 Jan 2018 15:59:50 -0500 Received: from mail-by2nam01on0120.outbound.protection.outlook.com ([104.47.34.120]:44880 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932206AbeARU7n (ORCPT ); Thu, 18 Jan 2018 15:59:43 -0500 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; bh=wwn7QDYVzaUOFGBvcjbKcGYswHCatSIntYoT11CyJfw=; b=HNbUhtMGUaHZcWu4PS3Ujx15S9ZGC4MVphDt1QreTuvInjKWfmkpXzXQx1YZIWDh1XcB5GgMSVN6DPO1Qc44GiebwiZr2NB0GIj03ThcW2NgudiH/kY9iWarPxOwZW3iAmvS3LN6iliDaGkQ9bs0iPo0tcjSLkLyXnHfBF3FddU= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1064.namprd21.prod.outlook.com (52.132.130.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.444.7; Thu, 18 Jan 2018 20:59:39 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 20:59:39 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Ralf Baechle , "Sasha Levin" Subject: [added to the 4.1 stable tree] MIPS: ip22: Fix ip28 build for modern gcc Thread-Topic: [added to the 4.1 stable tree] MIPS: ip22: Fix ip28 build for modern gcc Thread-Index: AQHTkJ8/co4bIx8UUUWA78A77L1MOg== Date: Thu, 18 Jan 2018 20:59:36 +0000 Message-ID: <20180118205908.3220-25-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.98.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1064; 7:z469rPeIGQK5cGj+g5SXRNgP2e2RxJwTdpyc9jUaHLUlKtUmOsIi6G8p4cv2+pQWZ1fUaSiwzO8w8JaeWymGAw7JYx87ccmmxgWXiyohQjF5Xiks2aOMdM19rJNgojhJNSd99PV0u37kqgkbGVPpLZY3nq83QDGFw4bMPPeLEpXvuviaGkXDKyDtASji6YOEzFmxCByvB+5S20eRjeZU4wwjMQ1Ypzlj9R+2ySOvIRq9a2vvgwwm0cSMO01JtQxN x-ms-office365-filtering-correlation-id: a24d441f-0625-47dc-876b-08d55eb663f4 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB1064; x-ms-traffictypediagnostic: DM5PR2101MB1064: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(20558992708506)(89211679590171)(9452136761055); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(5005006)(8121501046)(3231046)(2400067)(944501161)(3002001)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041282)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB1064; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB1064; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39380400002)(346002)(396003)(39860400002)(366004)(376002)(199004)(189003)(106356001)(25786009)(68736007)(107886003)(2900100001)(26005)(105586002)(102836004)(8676002)(4326008)(6506007)(14454004)(59450400001)(76176011)(86612001)(81156014)(10090500001)(8936002)(86362001)(72206003)(966005)(81166006)(5250100002)(6346003)(2501003)(478600001)(10290500003)(99286004)(2950100002)(305945005)(53936002)(2906002)(6666003)(5660300001)(3846002)(1076002)(66066001)(6116002)(22452003)(316002)(6512007)(110136005)(54906003)(3280700002)(6436002)(3660700001)(97736004)(6306002)(36756003)(7736002)(6486002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1064; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: EL+APzWI7PImXuOY1EtzhF1JGENZxWr9khn3KH0OfCpkFkxU1ijxt3eIBzrGP3pO1Z2NS2mnywDQKvyq/vfTWQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a24d441f-0625-47dc-876b-08d55eb663f4 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 20:59:36.5728 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1064 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ Upstream commit 23ca9b522383d3b9b7991d8586db30118992af4a ] 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: Sasha Levin --- arch/mips/sgi-ip22/Platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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