From patchwork Mon Apr 18 16:04:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 66044 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1367582qge; Mon, 18 Apr 2016 09:05:17 -0700 (PDT) X-Received: by 10.66.65.109 with SMTP id w13mr50214493pas.142.1460995517077; Mon, 18 Apr 2016 09:05:17 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tr1si4221590pab.135.2016.04.18.09.05.16; Mon, 18 Apr 2016 09:05:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753150AbcDRQFL (ORCPT + 29 others); Mon, 18 Apr 2016 12:05:11 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38617 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751946AbcDRQFI (ORCPT ); Mon, 18 Apr 2016 12:05:08 -0400 Received: by mail-wm0-f53.google.com with SMTP id u206so131487040wme.1 for ; Mon, 18 Apr 2016 09:05:07 -0700 (PDT) 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=xaKYBIPjipVZOr6LWU1iGt/jA7sB+mHXaTFld9I4Nbs=; b=av6CtQmPA9hBgDyHiIFXu3j9yXcRE4msyx9oAtplu5RXRocxDnl/e5R6Kx6L9/SrMY AHSYilB5fxCdFrZxNGbmCFxP7K1vf14xZ+VP+sUOEKOnHWG9w+0Jl5sz3H4TuLJq9U1I BnQzWZH4LhBIrBAF0CbqNMom41elOx1vgRhuw= 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=xaKYBIPjipVZOr6LWU1iGt/jA7sB+mHXaTFld9I4Nbs=; b=kklE3dtn05vGomj5DWdFpQRBnAVLaNTYpoFwCYIe/uWvUASjeNnTzI1rsv2s5GFJoD FBPE1RnNLS4FYZ06ituPzwvFE7etWL6KPUP/eBeBZzIGnEK89nw5F84GdCgKZeu56coC PBlhvZNwJO/jdapjoDZCpdKMI4rcfWTrVCJQeVOAHgqpxEKVCnoY/3eDc3LB/BbfWjfW tB/agAf4SYWVs7rHQXxtPJT49UQtg+psNQzCV0gTYk1BrkXHqSljG/V8PVqvBcn/316r ++tgEMtc67JjPeca3u81c4gX4KB21y4yK4EV780aXJCmBuYKtzudl624AYsdqtkrXyty Q19w== X-Gm-Message-State: AOPr4FURq6zeVndiuKpTF1iRLyQWZ9AEBWHgwTu7LhQR1pXxXquU5gBodUnPWR5zTasBZZFM X-Received: by 10.28.13.141 with SMTP id 135mr20365169wmn.12.1460995506874; Mon, 18 Apr 2016 09:05:06 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id e12sm27231198wma.15.2016.04.18.09.05.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Apr 2016 09:05:06 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, lftan@altera.com, jonas@southpole.se Cc: will.deacon@arm.com, Ard Biesheuvel Subject: [PATCH resend 2/3] openrisc: drop wrongly typed definition of page_to_virt() Date: Mon, 18 Apr 2016 18:04:56 +0200 Message-Id: <1460995497-24312-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460995497-24312-1-git-send-email-ard.biesheuvel@linaro.org> References: <1460995497-24312-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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. Signed-off-by: Ard Biesheuvel --- arch/openrisc/include/asm/page.h | 2 -- 1 file changed, 2 deletions(-) -- 2.5.0 diff --git a/arch/openrisc/include/asm/page.h b/arch/openrisc/include/asm/page.h index e613d3673034..35bcb7cd2cde 100644 --- a/arch/openrisc/include/asm/page.h +++ b/arch/openrisc/include/asm/page.h @@ -81,8 +81,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)