From patchwork Wed Jun 5 18:11:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 10977465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 88DB16C5 for ; Wed, 5 Jun 2019 18:11:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BEDF1FE8E for ; Wed, 5 Jun 2019 18:11:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 702801FFE4; Wed, 5 Jun 2019 18:11:47 +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=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E2D827B13 for ; Wed, 5 Jun 2019 18:11:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726543AbfFESLq (ORCPT ); Wed, 5 Jun 2019 14:11:46 -0400 Received: from mail-oi1-f201.google.com ([209.85.167.201]:47049 "EHLO mail-oi1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726421AbfFESLq (ORCPT ); Wed, 5 Jun 2019 14:11:46 -0400 Received: by mail-oi1-f201.google.com with SMTP id v4so3277314oia.13 for ; Wed, 05 Jun 2019 11:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=IUDyCsceSXPXSWjwfPm5Qgx7aA6PYOLxueNpOxuiB3c=; b=mJbuTQhgGgNcUnwfXeomxPb44808Ea2BX9rZI0TxVGCc/SgQRSfjMpLpiKqT7ggtDv VAerZFzSEtT3KyL5cm2l1I0fhWJvxl3RdbY1fTN6IZ0C3eCuWrKiavQEJ5r6bYYdZ52B qMUqEVo5HpDLCQy+zC1DlAm6veklTHOYcHf1VsgBz5Ah8GIDn7jTrYmp8X+gOPjUuXuK 0TB1FBMDSHT1MRZmGnXtIyw6LU246vrUjC43pHSsoE73XrkY4Ixq94Vn5nq4x8SQihUF kZBusYopE4G0vVoKIVkLceOgd3P6XhpL3ZZ4DXiTlLnCivCypIc4XlSpmRYQODRmDUAP NgDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=IUDyCsceSXPXSWjwfPm5Qgx7aA6PYOLxueNpOxuiB3c=; b=B3nIngZMOZEyNwCeZHhJttlvulZM9sAF0UBQsE2S+i35OCOAIkYWu64ifwvvd+7POa fiaxg0ugmP56WWfVyzzU0IV08cAawd8M62NDE4EdNhpNsZIPueuAHzDSdfoUNEiTrKa9 3r95GaK/EHPchSIFJ5G8h7iBbI2uwLKjRc9Sx08Tzwy17TiAZoJNVfgxxd49QmWAWl/o qM2+1wuCbjTU0CAKjSuNOVQ+Mso7Sl8kqus72CNhrfrn05ZOZOu4SRdXZmZ8I+cdZTkM ceFweyfsVToFHI+6CLk9gUqs3DOlWE5Rkg8pFRMzozfoIEkouKF5IkQsUBNGn2+jWaCj 9PgQ== X-Gm-Message-State: APjAAAULaMaxfYspEGteCD9esgWVEn6k0MtDg13L0Jlrn0BFTpGJtOel bUKoO1bbJvYyuTvF9roVpQ41NZD9Yhy8++neUrRCIA8h8KjTjQrdRQX2TpRHPdGCcmgdwyMLlpS n7A0OOtC7mB9dPyaz2TYdZg9/46rKTvSzgD1YkkaWo71h4eaMqGYynjkUbDpUq5nXkKjkKTHdg4 cAndXHbo4Kx/UHrsklifo= X-Google-Smtp-Source: APXvYqyduJ6HLN0q0QIElOqgaSufST5mMN3dV7e9/vaN0SqCzEomB48iPYHVUBk9gCw37BffevsMUotu3InrcNuPJ1DecQ== X-Received: by 2002:aca:40c1:: with SMTP id n184mr5654465oia.73.1559758305705; Wed, 05 Jun 2019 11:11:45 -0700 (PDT) Date: Wed, 5 Jun 2019 11:11:40 -0700 Message-Id: <20190605181140.35559-1-matthewgarrett@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.22.0.rc1.311.g5d7573a151-goog Subject: [PATCH] efi: Fix TPM code build failure on ARM From: Matthew Garrett To: linux-integrity@vger.kernel.org Cc: peterhuewe@gmx.de, jarkko.sakkinen@linux.intel.com, jgg@ziepe.ca, linux-efi@vger.kernel.org, ard.biesheuvel@linaro.org, Matthew Garrett , Matthew Garrett Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP asm/early_ioremap.h needs to be #included before tpm_eventlog.h in order to ensure that early_memremap is available. Signed-off-by: Matthew Garrett Acked-by: Ard Biesheuvel --- drivers/firmware/efi/tpm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index 0bdceb5913aa..1d3f5ca3eaaf 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -7,13 +7,12 @@ #define TPM_MEMREMAP(start, size) early_memremap(start, size) #define TPM_MEMUNMAP(start, size) early_memunmap(start, size) +#include #include #include #include #include -#include - int efi_tpm_final_log_size; EXPORT_SYMBOL(efi_tpm_final_log_size);