From 3f3bada419adc46d7e978292fdcdd18a78cf1d04 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 26 Jan 2012 10:28:09 -0500 Subject: [PATCH] Drop revert-efi-rtclock.patch. Issue was fixed by upstream commit 47997d75 --- kernel.spec | 5 ++- revert-efi-rtclock.patch | 85 ---------------------------------------- 2 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 revert-efi-rtclock.patch diff --git a/kernel.spec b/kernel.spec index a6d04e0bc..d9f072d2d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -722,7 +722,6 @@ Patch12016: disable-i8042-check-on-apple-mac.patch Patch12303: dmar-disable-when-ricoh-multifunction.patch -Patch13002: revert-efi-rtclock.patch Patch13003: efi-dont-map-boot-services-on-32bit.patch Patch20000: utrace.patch @@ -1418,7 +1417,6 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch # rhbz#605888 ApplyPatch dmar-disable-when-ricoh-multifunction.patch -ApplyPatch revert-efi-rtclock.patch ApplyPatch efi-dont-map-boot-services-on-32bit.patch # utrace. @@ -2274,6 +2272,9 @@ fi # ||----w | # || || %changelog +* Thu Jan 26 2012 Josh Boyer +- Drop revert-efi-rtclock.patch. Issue was fixed by upstream commit 47997d75 + * Wed Jan 25 2012 Peter Robinson - Build perf/tools on ARM sfp/hfp not just sfp diff --git a/revert-efi-rtclock.patch b/revert-efi-rtclock.patch deleted file mode 100644 index 3c6b74f0c..000000000 --- a/revert-efi-rtclock.patch +++ /dev/null @@ -1,85 +0,0 @@ -commit d80d983c0fbfe0b0f6bd83c4279e1077c31e7fe4 -Author: Josh Boyer -Date: Fri Jan 20 10:12:15 2012 -0500 - - Revert "x86: Serialize EFI time accesses on rtc_lock" - - This reverts commit ef68c8f87ed13f65df867dddf36c0e185b27b942. - -diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c -index 4cf9bd0..457e37a 100644 ---- a/arch/x86/platform/efi/efi.c -+++ b/arch/x86/platform/efi/efi.c -@@ -90,50 +90,26 @@ early_param("add_efi_memmap", setup_add_efi_memmap); - - static efi_status_t virt_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc) - { -- unsigned long flags; -- efi_status_t status; -- -- spin_lock_irqsave(&rtc_lock, flags); -- status = efi_call_virt2(get_time, tm, tc); -- spin_unlock_irqrestore(&rtc_lock, flags); -- return status; -+ return efi_call_virt2(get_time, tm, tc); - } - - static efi_status_t virt_efi_set_time(efi_time_t *tm) - { -- unsigned long flags; -- efi_status_t status; -- -- spin_lock_irqsave(&rtc_lock, flags); -- status = efi_call_virt1(set_time, tm); -- spin_unlock_irqrestore(&rtc_lock, flags); -- return status; -+ return efi_call_virt1(set_time, tm); - } - - static efi_status_t virt_efi_get_wakeup_time(efi_bool_t *enabled, - efi_bool_t *pending, - efi_time_t *tm) - { -- unsigned long flags; -- efi_status_t status; -- -- spin_lock_irqsave(&rtc_lock, flags); -- status = efi_call_virt3(get_wakeup_time, -- enabled, pending, tm); -- spin_unlock_irqrestore(&rtc_lock, flags); -- return status; -+ return efi_call_virt3(get_wakeup_time, -+ enabled, pending, tm); - } - - static efi_status_t virt_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm) - { -- unsigned long flags; -- efi_status_t status; -- -- spin_lock_irqsave(&rtc_lock, flags); -- status = efi_call_virt2(set_wakeup_time, -- enabled, tm); -- spin_unlock_irqrestore(&rtc_lock, flags); -- return status; -+ return efi_call_virt2(set_wakeup_time, -+ enabled, tm); - } - - static efi_status_t virt_efi_get_variable(efi_char16_t *name, -@@ -233,15 +209,12 @@ static efi_status_t __init phys_efi_set_virtual_address_map( - static efi_status_t __init phys_efi_get_time(efi_time_t *tm, - efi_time_cap_t *tc) - { -- unsigned long flags; - efi_status_t status; - -- spin_lock_irqsave(&rtc_lock, flags); - efi_call_phys_prelog(); - status = efi_call_phys2(efi_phys.get_time, virt_to_phys(tm), - virt_to_phys(tc)); - efi_call_phys_epilog(); -- spin_unlock_irqrestore(&rtc_lock, flags); - return status; - } -