From patchwork Tue Jan 17 15:23:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Andrushchenko X-Patchwork-Id: 9521417 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 66B4E60244 for ; Tue, 17 Jan 2017 15:39:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5524326530 for ; Tue, 17 Jan 2017 15:39:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4957F2854A; Tue, 17 Jan 2017 15:39:25 +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.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CF07B26530 for ; Tue, 17 Jan 2017 15:39:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cTVr1-0004gD-4N; Tue, 17 Jan 2017 15:39:23 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTVqy-0004SF-Af for linux-arm-kernel@bombadil.infradead.org; Tue, 17 Jan 2017 15:39:20 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTVcX-0006NM-60 for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2017 15:24:27 +0000 Received: by mail-wm0-x241.google.com with SMTP id r144so39228430wme.0 for ; Tue, 17 Jan 2017 07:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KJgdC0kTXb8RmR0b/e17mwlH9xZ8bFRUq8scNqwsyks=; b=J6pqAWMdimNzoBe/3noioceJlR2oPaGknPR8b1BIbIMxaeziJ6wJaMquW4GEnM6rCq NMBxViIi+Ar9pzQOoR5VYsfGu4Ky4FYETvOHb6i5IYNV2jb79mTeAqPkyjolPTs5yKiv 658zARJJd5OiDR84uC626t2q7lfNHaO7VP8WNdPpP5r3Bjy84uwjqJ9b82RO6RFieZeg GiGEOTynbKrrqEODNUYt8qSMJlTrSGjbQvXe8Het1bfODL54Yj7MCySKWgKcNhDT6d5v m3P0c1IwVe+GKe1jVpuWNeO1SLIl7k8eENKkWLjzQShpeMLcEPsAZ4VOy7BylpA5W4cW eyyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KJgdC0kTXb8RmR0b/e17mwlH9xZ8bFRUq8scNqwsyks=; b=butlLabqqWdsnSDo+X0vPhmYSov6r8HyYneN0f7ADg7BpJ0MUbbOzA0PZSwg1tYL7P HbxlD6aVdol89vFWoysJf5xlSuKTnEkQ6YdXgZqFOzfnl5+luXSVHVsfFH6qV1Hq8uJ/ 6oGItmW8jITgzjqbJYQB+KJ0tUQv/LZczDrBa48Utyt5d9XGAsBWqQtueNYSPR+1BFmK XOtOKjPCNCZz18i1iitpzU9PTYvT5VxogIo9FXvZ4FnVKUWMA8Tmip31+/+LyzIZwhBf PgFBAYfW7cWwVYOdoIAPRNFznxSAx1S/tbhW3VRY1DKDFa8imf0KaSgl1vLlDRpbKwpd 1pgQ== X-Gm-Message-State: AIkVDXIbSN6RXN5n7IyVeNw+mMOrb2kGKWRcID0g+Kbf22l52TcHzhRNtiq2GdehaEvZNA== X-Received: by 10.28.213.133 with SMTP id m127mr18275457wmg.90.1484666643151; Tue, 17 Jan 2017 07:24:03 -0800 (PST) Received: from a2k-HP-ProDesk-600-G2-SFF.kyiv.epam.com (ll-57.209.223.85.sovam.net.ua. [85.223.209.57]) by smtp.gmail.com with ESMTPSA id z134sm37677485wmc.20.2017.01.17.07.24.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 07:24:02 -0800 (PST) From: Oleksandr Andrushchenko To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: mm: fix __page_to_voff definition Date: Tue, 17 Jan 2017 17:23:53 +0200 Message-Id: <1484666633-1753-1-git-send-email-andr2000@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170117_152425_255123_E4FC55E4 X-CRM114-Status: UNSURE ( 9.81 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleksandr_Andrushchenko@epam.com, vlad.babchuk@gmail.com, catalin.marinas@arm.com, will.deacon@arm.com, andrii.anisov@gmail.com, olekstysh@gmail.com, al1img@gmail.com, neeraju@codeaurora.org, joculator@gmail.com 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 From: Oleksandr Andrushchenko Fix parameter name for __page_to_voff, to match its definition. There are other callers of page_to_virt which do not declare 'page'. Fixes: 3fa72fe9c614 ("arm64: mm: fix __page_to_voff definition") Signed-off-by: Oleksandr Andrushchenko Acked-by: Mark Rutland --- arch/arm64/include/asm/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index bfe632808d77..90c39a662379 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -222,7 +222,7 @@ static inline void *phys_to_virt(phys_addr_t x) #define _virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) #else #define __virt_to_pgoff(kaddr) (((u64)(kaddr) & ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page)) -#define __page_to_voff(page) (((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page)) +#define __page_to_voff(kaddr) (((u64)(kaddr) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page)) #define page_to_virt(page) ((void *)((__page_to_voff(page)) | PAGE_OFFSET)) #define virt_to_page(vaddr) ((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))