diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-19 20:56:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-28 13:38:34 (GMT) |
| commit | 9e84c1288f809abcb9d7bfaff0dc882627a1a56d (patch) | |
| tree | 13a4ae0cc7d2e948aa458b51ba97a96bd6d9b55b /arch/sparc | |
| parent | f5f9cd078adc085bc74cc5465a975beac8d4c5d3 (diff) | |
| download | linux-fsl-qoriq-9e84c1288f809abcb9d7bfaff0dc882627a1a56d.tar.xz | |
sparc64: Fix gfp_flags setting in tsb_grow().
[ Upstream commit a55ee1ff751f88252207160087d8197bb7538d4c ]
We should "|= more_flags" rather than "= more_flags".
Reported-by: David Rientjes <rientjes@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/mm/tsb.c | 2 |
1 files changed, 1 insertions, 1 deletions
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()); |