From patchwork Wed Jan 18 07:09:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Andrushchenko X-Patchwork-Id: 9522821 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 7A976601C3 for ; Wed, 18 Jan 2017 07:10:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B1B528534 for ; Wed, 18 Jan 2017 07:10:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E83A28568; Wed, 18 Jan 2017 07:10:10 +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 6BE8C28534 for ; Wed, 18 Jan 2017 07:10:09 +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 1cTkNi-0006gX-Ut; Wed, 18 Jan 2017 07:10:06 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTkNg-0006BY-Ee for linux-arm-kernel@bombadil.infradead.org; Wed, 18 Jan 2017 07:10:04 +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 1cTkNd-0002Iv-1a for linux-arm-kernel@lists.infradead.org; Wed, 18 Jan 2017 07:10:02 +0000 Received: by mail-wm0-x241.google.com with SMTP id c85so1820544wmi.1 for ; Tue, 17 Jan 2017 23:09:40 -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=SxYpxm63SoqU0a2xnTXaFv4U0RZBPtvoN76zlvZ0R98=; b=OgfEbBNKzVmYTA3ahrCGjR7SE4xpDw+jWYU31LOdfoRvCVivF+fe60SeP+6Xu84Lqs ycI7t+aL5qkaci1Y/lk0Cnb62Ri5/8p0BEoUFcbIwkepkoCTxvfAYejkB/QC12qiTZJj D5loqEMwGIJ6WNYjsSutHhF0sNyPq9bfUeGG0QfCsCioqgd4BEp7jZs69hxb3ty1yCoO JeWxocmvZ2TtARm+S5+ParpPvXiFSHCiUII1RJIOViweo3ykBMLS+Eok8CgWmXELQ2cG ZxKQX4s4D367OXe/DCkXxe48mrZe88Z6NcZDyDDPkQ1nDs28e3NnWsIpXAKusRgNWENO 2lDA== 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=SxYpxm63SoqU0a2xnTXaFv4U0RZBPtvoN76zlvZ0R98=; b=ob3vJqFyq4aRaHc5macQqSdBxDhycOKBMWMIPuDliwqJ1oKx5pa33AgXsJhMeLLX/T AxmHpbsUUX01RLU1vTzRRtuqEdMn8OmkdnijT2ZxJ50b4UHuFYVAnXWUdz93TZd3aeyS iCu6eDH5vnXA+3OzkW/hH78jYK60WLVc6q4TsBUeh2ILXOMv4Hi70VeSqFHHH3CzHSeI 8+uiUBYgv4xUJ8Dw9tc/d1ZOmWsmxpBFhklmA+D0HZNJNZlQG4LhLcwXcK9ILCl6Cqml uKPHNfAtIFd6kXa+pH8CPgTwZH53Cd4u3K2P9utoOhruq07ixwSPgk7lLq87zJR0GCq1 B7+w== X-Gm-Message-State: AIkVDXKg9HMngFGqwsh+t+hrBeXuGtg1PT+K+thh/9vGAnr1WxKBEWZznDv0usU1x1Yleg== X-Received: by 10.28.21.84 with SMTP id 81mr20236611wmv.106.1484723379326; Tue, 17 Jan 2017 23:09:39 -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 r6sm2653251wmd.4.2017.01.17.23.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 23:09:38 -0800 (PST) From: Oleksandr Andrushchenko To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v1] arm64: mm: avoid name clash in __page_to_voff() Date: Wed, 18 Jan 2017 09:09:25 +0200 Message-Id: <1484723365-24147-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-20170118_071001_144087_80587F69 X-CRM114-Status: GOOD ( 11.25 ) 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: mark.rutland@arm.com, 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 The arm64 __page_to_voff() macro takes a parameter called 'page', and also refers to 'struct page'. Thus, if the value passed in is not called 'page', we'll refer to the wrong struct name (which might not exist). Fixes: 3fa72fe9c614 ("arm64: mm: fix __page_to_voff definition") Acked-by: Mark Rutland Suggested-by: Volodymyr Babchuk Signed-off-by: Oleksandr Andrushchenko --- Changes since initital: * use better description. 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))