From patchwork Tue Nov 29 18:55:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 9453019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 915DE60710 for ; Tue, 29 Nov 2016 19:00:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FF9C283E6 for ; Tue, 29 Nov 2016 19:00:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74A66283F1; Tue, 29 Nov 2016 19:00:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 311E4283E6 for ; Tue, 29 Nov 2016 19:00:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cBnbq-0006Av-56; Tue, 29 Nov 2016 18:58:30 +0000 Received: from mail-qt0-f175.google.com ([209.85.216.175]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cBnZf-0004iY-Dh for linux-arm-kernel@lists.infradead.org; Tue, 29 Nov 2016 18:56:20 +0000 Received: by mail-qt0-f175.google.com with SMTP id p16so164514586qta.0 for ; Tue, 29 Nov 2016 10:55:54 -0800 (PST) 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:in-reply-to :references; bh=Gd0XUnUOVp1fDBMadzzRQAh/84a+p17KbZC2UocRh6g=; b=N22I/A36WFjIbQolkLGt9v3ijjGDsFsE6BQykSBF9A+4sD97qp3mB6RJgHp3DDA1eB Mkht21Loy0N88bWhNasMDE5buKIre6Yz9SpYubXVDCOrdXRp5mmnTo6h52g7cwQClDt7 +cYaAA9JpZ+t2ICdB/d8qVzQJEJaIZ67eXncblyJv52Jilc8P5uPJ2DA8oczFMrZdLHg 76uVMhT7u+bnlsscPG+dNz8zPG6F3E+PshQk9vwj2/3ojy17af+PkVsHuyNNmho0sbfw NpQeyWkVX3hFsjxEjBmGKsCZasqkY9ali1evzwr6rN3Js4Jq2CeFQZjcnOvFaGgrNUNn 6LTw== X-Gm-Message-State: AKaTC03n93+Rr6cLYYFT2eL18YbRncAZH1Q5ooudDqEtjXPo4vMDkEFr1e18jtx3+CeC+oGx X-Received: by 10.200.37.178 with SMTP id e47mr28684442qte.7.1480445754004; Tue, 29 Nov 2016 10:55:54 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9800:177f::df9b]) by smtp.gmail.com with ESMTPSA id p28sm31446489qtb.31.2016.11.29.10.55.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Nov 2016 10:55:53 -0800 (PST) From: Laura Abbott To: Mark Rutland , Ard Biesheuvel , Will Deacon , Catalin Marinas , Boris Ostrovsky , David Vrabel , Juergen Gross Subject: [PATCHv4 06/10] xen: Switch to using __pa_symbol Date: Tue, 29 Nov 2016 10:55:25 -0800 Message-Id: <1480445729-27130-7-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480445729-27130-1-git-send-email-labbott@redhat.com> References: <1480445729-27130-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161129_105615_833095_24079874 X-CRM114-Status: GOOD ( 12.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xen-devel@lists.xenproject.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Ingo Molnar , "H. Peter Anvin" , Joonsoo Kim , Thomas Gleixner , Laura Abbott , Andrew Morton , linux-arm-kernel@lists.infradead.org, Marek Szyprowski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP __pa_symbol is the correct macro to use on kernel symbols. Switch to this from __pa. Signed-off-by: Laura Abbott --- Found during a sweep of the kernel. Untested. --- drivers/xen/xenbus/xenbus_dev_backend.c | 2 +- drivers/xen/xenfs/xenstored.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_dev_backend.c b/drivers/xen/xenbus/xenbus_dev_backend.c index 4a41ac9..31ca2bf 100644 --- a/drivers/xen/xenbus/xenbus_dev_backend.c +++ b/drivers/xen/xenbus/xenbus_dev_backend.c @@ -99,7 +99,7 @@ static int xenbus_backend_mmap(struct file *file, struct vm_area_struct *vma) return -EINVAL; if (remap_pfn_range(vma, vma->vm_start, - virt_to_pfn(xen_store_interface), + PHYS_PFN(__pa_symbol(xen_store_interface)), size, vma->vm_page_prot)) return -EAGAIN; diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c index fef20db..21009ea 100644 --- a/drivers/xen/xenfs/xenstored.c +++ b/drivers/xen/xenfs/xenstored.c @@ -38,7 +38,7 @@ static int xsd_kva_mmap(struct file *file, struct vm_area_struct *vma) return -EINVAL; if (remap_pfn_range(vma, vma->vm_start, - virt_to_pfn(xen_store_interface), + PHYS_PFN(__pa_symbol(xen_store_interface)), size, vma->vm_page_prot)) return -EAGAIN;