From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 371DBC33CB1 for ; Sun, 19 Jan 2020 10:40:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13DB82073D for ; Sun, 19 Jan 2020 10:40:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727101AbgASKkx (ORCPT ); Sun, 19 Jan 2020 05:40:53 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:60026 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726816AbgASKkw (ORCPT ); Sun, 19 Jan 2020 05:40:52 -0500 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1it80e-0001hJ-Cj; Sun, 19 Jan 2020 11:40:48 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id EFC231C1A1A; Sun, 19 Jan 2020 11:40:47 +0100 (CET) Date: Sun, 19 Jan 2020 10:40:47 -0000 From: "tip-bot2 for Sean Christopherson" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/headers] x86/efi: Explicitly include realmode.h to handle RM trampoline quirk Cc: Sean Christopherson , Ingo Molnar , x86 , LKML In-Reply-To: <20191126165417.22423-2-sean.j.christopherson@intel.com> References: <20191126165417.22423-2-sean.j.christopherson@intel.com> MIME-Version: 1.0 Message-ID: <157943044777.396.1969786889590406766.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the core/headers branch of tip: Commit-ID: e71b6f0b68de3296839a311355c5f590ac3446e5 Gitweb: https://git.kernel.org/tip/e71b6f0b68de3296839a311355c5f590ac3446e5 Author: Sean Christopherson AuthorDate: Tue, 26 Nov 2019 08:54:06 -08:00 Committer: Ingo Molnar CommitterDate: Tue, 10 Dec 2019 10:15:47 +01:00 x86/efi: Explicitly include realmode.h to handle RM trampoline quirk Explicitly include asm/realmode.h, which is needed to handle a real mode trampoline quirk in efi_free_boot_services(), instead of picking it up by way of linux/acpi.h. acpi.h will soon stop including realmode.h so that changing realmode.h doesn't require a full kernel rebuild. Signed-off-by: Sean Christopherson Link: https://lkml.kernel.org/r/20191126165417.22423-2-sean.j.christopherson@intel.com Signed-off-by: Ingo Molnar --- arch/x86/platform/efi/quirks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 7675cf7..4de2446 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #define EFI_MIN_RESERVE 5120