From patchwork Mon Feb 29 14:44:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 63221 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1292565lbc; Mon, 29 Feb 2016 06:49:27 -0800 (PST) X-Received: by 10.66.248.198 with SMTP id yo6mr22392127pac.54.1456757367106; Mon, 29 Feb 2016 06:49:27 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id c74si43490386pfj.65.2016.02.29.06.49.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Feb 2016 06:49:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aaP7R-0005D6-43; Mon, 29 Feb 2016 14:48:17 +0000 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aaP5G-0003Ro-78 for linux-arm-kernel@lists.infradead.org; Mon, 29 Feb 2016 14:46:05 +0000 Received: by mail-wm0-x235.google.com with SMTP id p65so48539375wmp.0 for ; Mon, 29 Feb 2016 06:45:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Du1gMwVRmwO8oLRbj29cULQ3Xpy6NQkv2hMqnGxnuvg=; b=WZUgqZq4y93njaW0ugr0mdxFB32651MEpw40j6No6z2LAINpJdRirx3fnJfiQKjoAI qjaOylA4TlCyI1zS3Ss74mQ1XPGVT+tVcMLaEQimci2uWesyhSC1BB3SBpdO/WvHglbK 5rGoh9vNj+B/KKyWgKJo+GqIDDK9XtW/bGYxA= 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=Du1gMwVRmwO8oLRbj29cULQ3Xpy6NQkv2hMqnGxnuvg=; b=k1K0pRFdYgVZwPpVmZv0PwfA+ELwg5ed9hsyPRl/Cva1bgbv97vTdZomnPitiFPm3d TqNrZGICXIKn5b4HJOGt22JHE3owcIKH5SoGbhpRNDdMKumTwWbX3tX3sRDJIdirQbkm nxkJj0fyW7qBC9WpL+66H7XE4niBN5jsWmOaOwmXWA4jNhx/zB352NNSgFhXIoBAgJtE hqNuWDuErXemmo/EhBhmXuMftJopQxKOhw3TWpfZiqaq6YsA8iF6aOq1kvjY63Le3QtT /o9DKJYnc+TLOf8gKzEkfNpNQgQORGDmox4ayV9GU18CgoDp/uEusWdXz+jMy7pWGbnu Gxgg== X-Gm-Message-State: AD7BkJINnCpiNfFImtVQzeJ1hwfj2lfOa2BfoggLuubq0iBPFFHiCSgd+mWMBR6jKyO8V+DH X-Received: by 10.28.150.148 with SMTP id y142mr11255246wmd.55.1456757141863; Mon, 29 Feb 2016 06:45:41 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id di1sm26196693wjc.3.2016.02.29.06.45.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 06:45:41 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, will.deacon@arm.com, mark.rutland@arm.com Subject: [PATCH v2 8/9] openrisc: drop wrongly typed definition of page_to_virt() Date: Mon, 29 Feb 2016 15:44:43 +0100 Message-Id: <1456757084-1078-9-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456757084-1078-1-git-send-email-ard.biesheuvel@linaro.org> References: <1456757084-1078-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160229_064602_683317_E4539E61 X-CRM114-Status: GOOD ( 10.14 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:235 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: jonas@southpole.se, Ard Biesheuvel , linux-mm@kvack.org, nios2-dev@lists.rocketboards.org, linux@lists.openrisc.net, lftan@altera.com, akpm@linux-foundation.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org To align with generic code and other architectures that expect the macro page_to_virt to produce an expression whose type is 'void*', drop the arch specific definition, which is never referenced anyway. Cc: linux-mm@kvack.org Cc: Andrew Morton Cc: Jonas Bonn Cc: linux@lists.openrisc.net Signed-off-by: Ard Biesheuvel --- arch/openrisc/include/asm/page.h | 2 -- 1 file changed, 2 deletions(-) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/openrisc/include/asm/page.h b/arch/openrisc/include/asm/page.h index 108906f991d6..1976f7272b1f 100644 --- a/arch/openrisc/include/asm/page.h +++ b/arch/openrisc/include/asm/page.h @@ -84,8 +84,6 @@ typedef struct page *pgtable_t; #define virt_to_page(addr) \ (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)) -#define page_to_virt(page) \ - ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET) #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)