diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/x86/kernel/efi.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'arch/x86/kernel/efi.c')
| -rw-r--r-- | 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 ad5bd988fb79..cdcfb122f256 100644 --- a/arch/x86/kernel/efi.c +++ b/arch/x86/kernel/efi.c | |||
| @@ -454,8 +454,10 @@ void __init efi_init(void) | |||
| 454 | if (add_efi_memmap) | 454 | if (add_efi_memmap) |
| 455 | do_add_efi_memmap(); | 455 | do_add_efi_memmap(); |
| 456 | 456 | ||
| 457 | #ifdef CONFIG_X86_32 | ||
| 457 | x86_platform.get_wallclock = efi_get_time; | 458 | x86_platform.get_wallclock = efi_get_time; |
| 458 | x86_platform.set_wallclock = efi_set_rtc_mmss; | 459 | x86_platform.set_wallclock = efi_set_rtc_mmss; |
| 460 | #endif | ||
| 459 | 461 | ||
| 460 | /* Setup for EFI runtime service */ | 462 | /* Setup for EFI runtime service */ |
| 461 | reboot_type = BOOT_EFI; | 463 | reboot_type = BOOT_EFI; |