This is a note to let you know that I've just added the patch titled

    sparc64: Fix gfp_flags setting in tsb_grow().

to the 3.7-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     sparc64-fix-gfp_flags-setting-in-tsb_grow.patch
and it can be found in the queue-3.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 156cad2c15016b185b3eb91bdd1ee19a689fd921 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <[email protected]>
Date: Tue, 19 Feb 2013 12:56:18 -0800
Subject: sparc64: Fix gfp_flags setting in tsb_grow().


From: "David S. Miller" <[email protected]>

[ Upstream commit a55ee1ff751f88252207160087d8197bb7538d4c ]

We should "|= more_flags" rather than "= more_flags".

Reported-by: David Rientjes <[email protected]>
Acked-by: David Rientjes <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 arch/sparc/mm/tsb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/sparc/mm/tsb.c
+++ b/arch/sparc/mm/tsb.c
@@ -314,7 +314,7 @@ void tsb_grow(struct mm_struct *mm, unsi
 retry_tsb_alloc:
        gfp_flags = GFP_KERNEL;
        if (new_size > (PAGE_SIZE * 2))
-               gfp_flags = __GFP_NOWARN | __GFP_NORETRY;
+               gfp_flags |= __GFP_NOWARN | __GFP_NORETRY;
 
        new_tsb = kmem_cache_alloc_node(tsb_caches[new_cache_index],
                                        gfp_flags, numa_node_id());


Patches currently in stable-queue which might be from [email protected] are

queue-3.7/sparc64-fix-gfp_flags-setting-in-tsb_grow.patch
queue-3.7/sparc64-fix-tsb_grow-in-atomic-context.patch
queue-3.7/sparc64-handle-hugepage-tsb-being-null.patch
queue-3.7/sunvdc-fix-off-by-one-in-generic_request.patch
queue-3.7/sparc64-fix-huge-pmd-to-pte-translation-for-sun4u-in-tlb-miss-handler.patch
queue-3.7/b43-increase-number-of-rx-dma-slots.patch
queue-3.7/sparc64-fix-get_user_pages_fast-wrt.-thp.patch
queue-3.7/sparc64-add-missing-have_arch_transparent_hugepage.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to