[ 3.5.y.z extended stable ] Patch "sparc64: Fix gfp_flags setting in tsb_grow()." has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    sparc64: Fix gfp_flags setting in tsb_grow().

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 3d53ddb8db392cf0f2c02ec4eea61ad27abf9c2c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem at davemloft.net>
Date: Tue, 19 Feb 2013 12:56:18 -0800
Subject: [PATCH] sparc64: Fix gfp_flags setting in tsb_grow().

commit a55ee1ff751f88252207160087d8197bb7538d4c upstream.

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

Reported-by: David Rientjes <rientjes at google.com>
Acked-by: David Rientjes <rientjes at google.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 arch/sparc/mm/tsb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c
index c52add7..7c2d9ac 100644
--- a/arch/sparc/mm/tsb.c
+++ b/arch/sparc/mm/tsb.c
@@ -331,7 +331,7 @@ void tsb_grow(struct mm_struct *mm, unsigned long tsb_index, unsigned long rss)
 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());
--
1.8.1.2