[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20131216141835.0ded286276730efcf7fed52e@canb.auug.org.au>
Date: Mon, 16 Dec 2013 14:18:35 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
"H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Matthew Garrett <matthew.garrett@...ula.com>,
Borislav Petkov <bp@...e.de>,
Matt Fleming <matt.fleming@...el.com>
Subject: linux-next: manual merge of the tip tree with Linus' tree
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/platform/efi/efi.c between commit 04bf9ba720fc ("x86, efi: Don't
use (U)EFI time services on 32 bit") from Linus' tree and commit
f4fccac05f7f ("x86/efi: Simplify EFI_DEBUG") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell <sfr@...b.auug.org.au>
diff --cc arch/x86/platform/efi/efi.c
index cceb813044ef,f8ec4dafc74e..000000000000
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@@ -690,9 -692,13 +692,7 @@@ void __init efi_init(void
set_bit(EFI_MEMMAP, &x86_efi_facility);
- #if EFI_DEBUG
-#ifdef CONFIG_X86_32
- if (efi_is_native()) {
- x86_platform.get_wallclock = efi_get_time;
- x86_platform.set_wallclock = efi_set_rtc_mmss;
- }
-#endif
print_efi_memmap();
- #endif
}
void __init efi_late_init(void)
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists