From patchwork Fri Oct 23 09:48:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 55475 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 54C1E22A9D for ; Fri, 23 Oct 2015 09:48:55 +0000 (UTC) Received: by wicfg8 with SMTP id fg8sf8572117wic.0 for ; Fri, 23 Oct 2015 02:48:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=k5O7RXOXfbYV7tyTpi09nydClOByQzdHqgJE8V3xB74=; b=BrpndohHw5uiHOVDvyJ8CqvRjMpt5SvOxhfC73Jor+XKx6ew+ihLqbj+6d+CnSLJ5N XhA7MJtWEkstH79dZNw+9btb2X0HjCQiSgkkbsY/8j1DBFsfAoKY1aZjV8mngr4tFLLR TiKsXzONVqyd6XwieYxMAb5apYhYMnITSRZrRyH3MMKTb0TwWIsqQfSl9oBNkZ4o3lg8 a854CTCI6R7z8CQH1AnqdKXwnWldg9Vl2Bh7JIK2aiA92VNvIU7knPy4GyuPGNa8s7Ku GYcSukxHKkUGpPTdVEOuXGYvBuyksiSRBBZtlCcfWxXud5A0G6McOZAaVvo4OIlm8gKL QfBA== X-Gm-Message-State: ALoCoQlI2wogFvK56Ebhb9rSRFZnoJtdGBNkUGpKjyAKsUGAszwb1kOGKyh4xlhib0/vFjudubJO X-Received: by 10.180.102.162 with SMTP id fp2mr660999wib.4.1445593734644; Fri, 23 Oct 2015 02:48:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.168.72 with SMTP id r69ls231786lfe.93.gmail; Fri, 23 Oct 2015 02:48:54 -0700 (PDT) X-Received: by 10.25.87.82 with SMTP id l79mr6927506lfb.64.1445593734463; Fri, 23 Oct 2015 02:48:54 -0700 (PDT) Received: from mail-lf0-x22f.google.com (mail-lf0-x22f.google.com. [2a00:1450:4010:c07::22f]) by mx.google.com with ESMTPS id yo3si12187519lbb.92.2015.10.23.02.48.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Oct 2015 02:48:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c07::22f as permitted sender) client-ip=2a00:1450:4010:c07::22f; Received: by lffz202 with SMTP id z202so77461485lff.3 for ; Fri, 23 Oct 2015 02:48:54 -0700 (PDT) X-Received: by 10.25.205.193 with SMTP id d184mr4742724lfg.72.1445593734325; Fri, 23 Oct 2015 02:48:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1109218lbq; Fri, 23 Oct 2015 02:48:53 -0700 (PDT) X-Received: by 10.66.141.12 with SMTP id rk12mr3890348pab.84.1445593733248; Fri, 23 Oct 2015 02:48:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gg6si28318805pbd.161.2015.10.23.02.48.52; Fri, 23 Oct 2015 02:48:53 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752806AbbJWJsp (ORCPT + 28 others); Fri, 23 Oct 2015 05:48:45 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:36782 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751651AbbJWJsl (ORCPT ); Fri, 23 Oct 2015 05:48:41 -0400 Received: by pacfv9 with SMTP id fv9so119544678pac.3 for ; Fri, 23 Oct 2015 02:48:40 -0700 (PDT) X-Received: by 10.68.136.10 with SMTP id pw10mr4056398pbb.89.1445593720662; Fri, 23 Oct 2015 02:48:40 -0700 (PDT) Received: from jessie.localdomain ([103.232.89.42]) by smtp.gmail.com with ESMTPSA id xm4sm18117871pab.27.2015.10.23.02.48.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Oct 2015 02:48:40 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, izumi.taku@jp.fujitsu.com, matt.fleming@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org Cc: kamezawa.hiroyu@jp.fujitsu.com, Ard Biesheuvel Subject: [PATCH 2/2] efi: Fix warning of int-to-pointer-cast on x86 32-bit builds Date: Fri, 23 Oct 2015 11:48:17 +0200 Message-Id: <1445593697-1342-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445593697-1342-1-git-send-email-ard.biesheuvel@linaro.org> References: <20151023085011.GB21631@gmail.com> <1445593697-1342-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c07::22f as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Taku Izumi Commit 0f96a99dab36 ("efi: Add "efi_fake_mem" boot option") introduces the following warning message: drivers/firmware/efi/fake_mem.c:186:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] new_memmap_phy was defined as a u64 value and cast to void*, causing a int-to-pointer-cast warning on x86 32-bit builds. However, since the void* type is inappropriate for a physical address, the definition of struct efi_memory_map::phys_map has been changed to phys_addr_t in the previous patch, and so the cast can be dropped entirely. This patch also changes the type of the "new_memmap_phy" variable from "u64" to "phys_addr_t" to align with the types of memblock_alloc() and struct efi_memory_map::phys_map. Reported-by: Ingo Molnar Signed-off-by: Taku Izumi [ard.biesheuvel: removed void* cast, updated commit log] Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/fake_mem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c index 32bcb14df2c8..ed3a854950cc 100644 --- a/drivers/firmware/efi/fake_mem.c +++ b/drivers/firmware/efi/fake_mem.c @@ -59,7 +59,7 @@ void __init efi_fake_memmap(void) u64 start, end, m_start, m_end, m_attr; int new_nr_map = memmap.nr_map; efi_memory_desc_t *md; - u64 new_memmap_phy; + phys_addr_t new_memmap_phy; void *new_memmap; void *old, *new; int i; @@ -183,7 +183,7 @@ void __init efi_fake_memmap(void) /* swap into new EFI memmap */ efi_unmap_memmap(); memmap.map = new_memmap; - memmap.phys_map = (void *)new_memmap_phy; + memmap.phys_map = new_memmap_phy; memmap.nr_map = new_nr_map; memmap.map_end = memmap.map + memmap.nr_map * memmap.desc_size; set_bit(EFI_MEMMAP, &efi.flags);