From patchwork Wed Aug 26 08:49:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 7075581 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 732539F344 for ; Wed, 26 Aug 2015 08:50:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D09B20916 for ; Wed, 26 Aug 2015 08:50:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A514420814 for ; Wed, 26 Aug 2015 08:50:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751887AbbHZIuK (ORCPT ); Wed, 26 Aug 2015 04:50:10 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:37608 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751995AbbHZIuH (ORCPT ); Wed, 26 Aug 2015 04:50:07 -0400 Received: by widdq5 with SMTP id dq5so8319162wid.0 for ; Wed, 26 Aug 2015 01:50:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=11S/tFGz1lAK0HzmYzrKZtY5KIUjgfHip7VB7DoRJAM=; b=CJ1wc8KXrmqQIwv7jtjK/zBnhKSBEgZ2VNZ+TK+f0naUOfy84ludmtbc3eEBuX8R5J iuV7KSDurYaQ0On1sR/P7cGVsDjflgmbvHrNh8GZJfpcWh2mELCi4oQFGQRDd66r3Ria 0VoI8YzapfYBV/+4OXsLJAGghRhXbBS2O2ZwE6UIy+KrZxXHfi+/W/9lwJJQ5PkkF+ff L31BOBz/0ADFzDmu4PyEuBO0of9WMt5uWAL/D3sAIuPuEZGr2hrEsFBC2eIZGdgGI6xr l4NkU4fAdSmbkvQ3xiAN+f9ETy97CL+StCkfRNhWdTdOXymUC/IAQUXLu5+n8+jEa/es SIag== X-Gm-Message-State: ALoCoQkGI2+0r+2mWQ7TNkaWWWN6eSDIbRHXGcKKyR4NLmFyHdWWAVwjJoYioQxWaZbiStIc8M2R X-Received: by 10.194.90.70 with SMTP id bu6mr56685788wjb.149.1440579006048; Wed, 26 Aug 2015 01:50:06 -0700 (PDT) Received: from localhost.localdomain (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by smtp.gmail.com with ESMTPSA id fn8sm6487356wib.2.2015.08.26.01.50.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Aug 2015 01:50:04 -0700 (PDT) From: Ard Biesheuvel To: linux-pci@vger.kernel.org, bhelgaas@google.com, thierry.reding@gmail.com, linux-tegra@vger.kernel.org Cc: swarren@wwwdotorg.org, Ard Biesheuvel Subject: [PATCH resend] PCI: tegra: use __pgprot() around static pgprot_t initializer Date: Wed, 26 Aug 2015 10:49:34 +0200 Message-Id: <1440578974-26527-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In order to comply with the rules that apply when STRICT_MM_TYPECHECKS is defined, wrap the initializer for a pgprot_t in __pgprot(). Signed-off-by: Ard Biesheuvel Acked-by: Thierry Reding --- drivers/pci/host/pci-tegra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 10c05718dbfd..0d3e6cb0c459 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -382,8 +382,8 @@ static unsigned long tegra_pcie_conf_offset(unsigned int devfn, int where) static struct tegra_pcie_bus *tegra_pcie_bus_alloc(struct tegra_pcie *pcie, unsigned int busnr) { - pgprot_t prot = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | L_PTE_XN | - L_PTE_MT_DEV_SHARED | L_PTE_SHARED; + pgprot_t prot = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | + L_PTE_XN | L_PTE_MT_DEV_SHARED | L_PTE_SHARED); phys_addr_t cs = pcie->cs->start; struct tegra_pcie_bus *bus; unsigned int i;