From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932727AbdDEI6K (ORCPT ); Wed, 5 Apr 2017 04:58:10 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59829 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932406AbdDEI6H (ORCPT ); Wed, 5 Apr 2017 04:58:07 -0400 Date: Wed, 5 Apr 2017 01:53:33 -0700 From: tip-bot for Bhupesh Sharma Message-ID: Cc: peterz@infradead.org, ard.biesheuvel@linaro.org, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, hpa@zytor.com, torvalds@linux-foundation.org, bhsharma@redhat.com Reply-To: peterz@infradead.org, ard.biesheuvel@linaro.org, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, hpa@zytor.com, torvalds@linux-foundation.org, bhsharma@redhat.com In-Reply-To: <20170404160245.27812-7-ard.biesheuvel@linaro.org> References: <20170404160245.27812-7-ard.biesheuvel@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] x86/efi/bgrt: Move efi-bgrt handling out of arch/x86 Git-Commit-ID: 2ab6c5b95a34685477ec10650ab26aa6c144a1a1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2ab6c5b95a34685477ec10650ab26aa6c144a1a1 Gitweb: http://git.kernel.org/tip/2ab6c5b95a34685477ec10650ab26aa6c144a1a1 Author: Bhupesh Sharma AuthorDate: Tue, 4 Apr 2017 17:02:40 +0100 Committer: Ingo Molnar CommitDate: Wed, 5 Apr 2017 09:27:50 +0200 x86/efi/bgrt: Move efi-bgrt handling out of arch/x86 Now with open-source boot firmware (EDK2) supporting ACPI BGRT table addition even for architectures like AARCH64, it makes sense to move out the 'efi-bgrt.c' file and supporting infrastructure from 'arch/x86' directory and house it inside 'drivers/firmware/efi', so that this common code can be used across architectures. Signed-off-by: Bhupesh Sharma Signed-off-by: Ard Biesheuvel Cc: Linus Torvalds Cc: Matt Fleming Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170404160245.27812-7-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- arch/x86/platform/efi/Makefile | 1 - drivers/firmware/efi/Makefile | 1 + {arch/x86/platform => drivers/firmware}/efi/efi-bgrt.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile index 066619b..f1d83b3 100644 --- a/arch/x86/platform/efi/Makefile +++ b/arch/x86/platform/efi/Makefile @@ -1,6 +1,5 @@ OBJECT_FILES_NON_STANDARD_efi_thunk_$(BITS).o := y obj-$(CONFIG_EFI) += quirks.o efi.o efi_$(BITS).o efi_stub_$(BITS).o -obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o obj-$(CONFIG_EARLY_PRINTK_EFI) += early_printk.o obj-$(CONFIG_EFI_MIXED) += efi_thunk_$(BITS).o diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index ad67342..0329d31 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -9,6 +9,7 @@ # KASAN_SANITIZE_runtime-wrappers.o := n +obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o obj-$(CONFIG_EFI) += efi.o vars.o reboot.o memattr.o obj-$(CONFIG_EFI) += capsule.o memmap.o obj-$(CONFIG_EFI_VARS) += efivars.o diff --git a/arch/x86/platform/efi/efi-bgrt.c b/drivers/firmware/efi/efi-bgrt.c similarity index 100% rename from arch/x86/platform/efi/efi-bgrt.c rename to drivers/firmware/efi/efi-bgrt.c