Patchwork [1/3] sparc64: Fix gfp_flags setting in tsb_grow().

login
register
mail settings
Submitter David Miller
Date Feb. 20, 2013, 6:41 a.m.
Message ID <20130220.014152.1773146557292897449.davem@davemloft.net>
Download mbox | patch
Permalink /patch/221964/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Feb. 20, 2013, 6:41 a.m.
We should "|= more_flags" rather than "= more_flags".

Reported-by: David Rientjes <rientjes@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 arch/sparc/mm/tsb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
David Rientjes - Feb. 20, 2013, 7:01 a.m.
On Wed, 20 Feb 2013, David Miller wrote:

> 
> We should "|= more_flags" rather than "= more_flags".
> 
> Reported-by: David Rientjes <rientjes@google.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: David Rientjes <rientjes@google.com>
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c
index 7f64743..428982b 100644
--- a/arch/sparc/mm/tsb.c
+++ b/arch/sparc/mm/tsb.c
@@ -314,7 +314,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());