aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2014-03-13 15:41:08 -0400
committerMatt Fleming <matt.fleming@intel.com>2014-03-17 17:54:28 -0400
commit3f4a7836e33134d4ac34fa7c99788f0c6a79fa1c (patch)
tree2ea2c9473a6aec168a5b8f500c8d436ba5beeaaf /arch/x86/platform
parente10848a26a962e404ac00c897dfe54f14290806d (diff)
x86/efi: Rip out phys_efi_get_time()
Dan reported that phys_efi_get_time() is doing kmalloc(..., GFP_KERNEL) under a spinlock which is very clearly a bug. Since phys_efi_get_time() has no users let's just delete it instead of trying to fix it. Note that since there are no users of phys_efi_get_time(), it is not possible to actually trigger a GFP_KERNEL alloc under the spinlock. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Nathan Zimmer <nzimmer@sgi.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Jan Beulich <JBeulich@suse.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/efi/efi.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 43e7cf6c6111..3781dd39e8bd 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -246,21 +246,6 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
246 return status; 246 return status;
247} 247}
248 248
249static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
250 efi_time_cap_t *tc)
251{
252 unsigned long flags;
253 efi_status_t status;
254
255 spin_lock_irqsave(&rtc_lock, flags);
256 efi_call_phys_prelog();
257 status = efi_call_phys2(efi_phys.get_time, virt_to_phys(tm),
258 virt_to_phys(tc));
259 efi_call_phys_epilog();
260 spin_unlock_irqrestore(&rtc_lock, flags);
261 return status;
262}
263
264int efi_set_rtc_mmss(const struct timespec *now) 249int efi_set_rtc_mmss(const struct timespec *now)
265{ 250{
266 unsigned long nowtime = now->tv_sec; 251 unsigned long nowtime = now->tv_sec;
@@ -592,16 +577,9 @@ static int __init efi_runtime_init32(void)
592 * EFI runtime services before set_virtual_address_map 577 * EFI runtime services before set_virtual_address_map
593 * is invoked. 578 * is invoked.
594 */ 579 */
595 efi_phys.get_time = (efi_get_time_t *)
596 (unsigned long)runtime->get_time;
597 efi_phys.set_virtual_address_map = 580 efi_phys.set_virtual_address_map =
598 (efi_set_virtual_address_map_t *) 581 (efi_set_virtual_address_map_t *)
599 (unsigned long)runtime->set_virtual_address_map; 582 (unsigned long)runtime->set_virtual_address_map;
600 /*
601 * Make efi_get_time can be called before entering
602 * virtual mode.
603 */
604 efi.get_time = phys_efi_get_time;
605 early_iounmap(runtime, sizeof(efi_runtime_services_32_t)); 583 early_iounmap(runtime, sizeof(efi_runtime_services_32_t));
606 584
607 return 0; 585 return 0;
@@ -623,16 +601,9 @@ static int __init efi_runtime_init64(void)
623 * EFI runtime services before set_virtual_address_map 601 * EFI runtime services before set_virtual_address_map
624 * is invoked. 602 * is invoked.
625 */ 603 */
626 efi_phys.get_time = (efi_get_time_t *)
627 (unsigned long)runtime->get_time;
628 efi_phys.set_virtual_address_map = 604 efi_phys.set_virtual_address_map =
629 (efi_set_virtual_address_map_t *) 605 (efi_set_virtual_address_map_t *)
630 (unsigned long)runtime->set_virtual_address_map; 606 (unsigned long)runtime->set_virtual_address_map;
631 /*
632 * Make efi_get_time can be called before entering
633 * virtual mode.
634 */
635 efi.get_time = phys_efi_get_time;
636 early_iounmap(runtime, sizeof(efi_runtime_services_64_t)); 607 early_iounmap(runtime, sizeof(efi_runtime_services_64_t));
637 608
638 return 0; 609 return 0;