Merge tag ‘efi-urgent’ into x86/urgent [Linux 3.9]

This Linux kernel change "Merge tag ‘efi-urgent’ into x86/urgent" is included in the Linux 3.9 release. This change is authored by H. Peter Anvin <hpa [at] linux.intel.com> on Thu Apr 25 14:00:22 2013 -0700. The commit for this change in Linux stable tree is 697dfd8 (patch). Other info about this change: Merge: 0fbd067 f697036

Merge tag 'efi-urgent' into x86/urgent

 * The EFI variable anti-bricking algorithm merged in -rc8 broke booting
   on some Apple machines because they implement EFI spec 1.10, which
   doesn't provide a QueryVariableInfo() runtime function and the logic
   used to check for the existence of that function was insufficient.
   Fix from Josh Boyer.

 * The anti-bricking algorithm also introduced a compiler warning on
   32-bit. Fix from Borislav Petkov.

Signed-off-by: H. Peter Anvin <[email protected]>

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/sparc/mm/tlb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
index 272aa4f..83d89bc 100644
--- a/arch/sparc/mm/tlb.c
+++ b/arch/sparc/mm/tlb.c
@@ -87,7 +87,7 @@ static void tlb_batch_add_one(struct mm_struct *mm, unsigned long vaddr,
    if (!tb->active) {
        global_flush_tlb_page(mm, vaddr);
        flush_tsb_user_page(mm, vaddr);
-       return;
+       goto out;
    }

    if (nr == 0)
@@ -98,6 +98,7 @@ static void tlb_batch_add_one(struct mm_struct *mm, unsigned long vaddr,
    if (nr >= TLB_BATCH_NR)
        flush_tlb_pending();

+out:
    put_cpu_var(tlb_batch);
 }

Leave a Reply

Your email address will not be published. Required fields are marked *