public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Feng Tang <feng.tang@intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	mjg59@srcf.ucam.org, tglx@linutronix.de, feng.tang@intel.com
Subject: [tip:x86/urgent] x86: Make EFI RTC function depend on 32bit again
Date: Tue, 27 Oct 2009 11:39:36 GMT	[thread overview]
Message-ID: <tip-772be899bc022ef2b911c3611b487d417e3269c3@git.kernel.org> (raw)
In-Reply-To: <20091020125402.028d66d5@feng-desktop>

Commit-ID:  772be899bc022ef2b911c3611b487d417e3269c3
Gitweb:     http://git.kernel.org/tip/772be899bc022ef2b911c3611b487d417e3269c3
Author:     Feng Tang <feng.tang@intel.com>
AuthorDate: Tue, 20 Oct 2009 12:54:02 +0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 27 Oct 2009 12:35:48 +0100

x86: Make EFI RTC function depend on 32bit again

The EFI RTC functions are only available on 32 bit. commit 7bd867df
(x86: Move get/set_wallclock to x86_platform_ops) removed the 32bit
dependency which leads to boot crashes on 64bit EFI systems.

Add the dependency back. 
Solves: http://bugzilla.kernel.org/show_bug.cgi?id=14466

Tested-by: Matthew Garrett <mjg59@srcf.ucam.org>
Signed-off-by: Feng Tang <feng.tang@intel.com>
LKML-Reference: <20091020125402.028d66d5@feng-desktop>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/kernel/efi.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index ad5bd98..cdcfb12 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -454,8 +454,10 @@ void __init efi_init(void)
 	if (add_efi_memmap)
 		do_add_efi_memmap();
 
+#ifdef CONFIG_X86_32
 	x86_platform.get_wallclock = efi_get_time;
 	x86_platform.set_wallclock = efi_set_rtc_mmss;
+#endif
 
 	/* Setup for EFI runtime service */
 	reboot_type = BOOT_EFI;

      reply	other threads:[~2009-10-27 11:40 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-20  0:34 [REGRESSION] EFI boot on x86 fails in .32 Matthew Garrett
2009-10-20  3:06 ` Matthew Garrett
2009-10-20  4:54   ` Feng Tang
2009-10-27 11:39     ` tip-bot for Feng Tang [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-772be899bc022ef2b911c3611b487d417e3269c3@git.kernel.org \
    --to=feng.tang@intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=mjg59@srcf.ucam.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox