[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20130220.014152.1773146557292897449.davem@davemloft.net>
Date: Wed, 20 Feb 2013 01:41:52 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: mroos@...ee
Cc: linux-mm@...r.kernel.org, linux-kernel@...r.kernel.org,
sparclinux@...r.kernel.org, rientjes@...gle.com, hannes@...xchg.org
Subject: [PATCH 1/3] sparc64: Fix gfp_flags setting in tsb_grow().
We should "|= more_flags" rather than "= more_flags".
Reported-by: David Rientjes <rientjes@...gle.com>
Signed-off-by: David S. Miller <davem@...emloft.net>
---
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 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());
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists