Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755255AbcDNMNo (ORCPT ); Thu, 14 Apr 2016 08:13:44 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:35803 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753748AbcDNMNl (ORCPT ); Thu, 14 Apr 2016 08:13:41 -0400 From: Matt Fleming To: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Tony Luck , Matt Fleming Subject: [PATCH v2 0/2] efi: Delete global 'memmap' variable Date: Thu, 14 Apr 2016 13:13:36 +0100 Message-Id: <1460636019-18593-1-git-send-email-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.7.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1320 Lines: 33 Ard's recent EFI memory attributes table patches caused ia64 build failures due to the use of the global 'memmap' EFI memory map object, which doesn't exist on ia64. That failure prompted me to dig out these two patches that delete 'memmap' once and for all and replace all occurrences with 'efi.memmap'. And because all call sites are now using 'efi.memmap' for_each_efi_memory_desc() can implicitly use that object instead of requiring it to be passed as an argument. Changes in v2: - Fixup bisection breakage due to efi->memmap misuse - Drop new 'phys_map' variable in arm-runtime.c per Ard Matt Fleming (2): efi: Iterate over efi.memmap in for_each_efi_memory_desc efi: Remove global 'memmap' arch/x86/platform/efi/efi.c | 125 ++++++++++++------------- arch/x86/platform/efi/efi_64.c | 10 +- arch/x86/platform/efi/quirks.c | 10 +- drivers/firmware/efi/arm-init.c | 20 ++-- drivers/firmware/efi/arm-runtime.c | 14 +-- drivers/firmware/efi/efi.c | 8 +- drivers/firmware/efi/fake_mem.c | 43 +++++---- drivers/firmware/efi/libstub/efi-stub-helper.c | 6 +- include/linux/efi.h | 14 ++- 9 files changed, 120 insertions(+), 130 deletions(-) -- 2.7.3