diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-02-19 12:56:18 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-20 09:45:53 -0800 |
| commit | a55ee1ff751f88252207160087d8197bb7538d4c (patch) | |
| tree | ebfe9694c0b2f556daee19764f8a4bf1ba3bb330 /arch/sparc/mm | |
| parent | Merge tag 'stable/for-linus-3.8-rc7-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen (diff) | |
| download | linux-dev-a55ee1ff751f88252207160087d8197bb7538d4c.tar.xz linux-dev-a55ee1ff751f88252207160087d8197bb7538d4c.zip | |
sparc64: Fix gfp_flags setting in tsb_grow().
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>
Diffstat (limited to 'arch/sparc/mm')
| -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 7f6474347491..428982b9becf 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()); |