From patchwork Wed Feb 20 06:41:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/3] sparc64: Fix gfp_flags setting in tsb_grow(). Date: Tue, 19 Feb 2013 20:41:52 -0000 From: David Miller X-Patchwork-Id: 221964 Message-Id: <20130220.014152.1773146557292897449.davem@davemloft.net> To: mroos@ut.ee Cc: linux-mm@vger.kernel.org, linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, rientjes@google.com, hannes@cmpxchg.org We should "|= more_flags" rather than "= more_flags". Reported-by: David Rientjes Signed-off-by: David S. Miller Acked-by: David Rientjes --- 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());