OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f741656
)
sparc64: Fix gfp_flags setting in tsb_grow().
author
David S. Miller
<davem@davemloft.net>
Tue, 19 Feb 2013 20:56:18 +0000
(12:56 -0800)
committer
David S. Miller
<davem@davemloft.net>
Wed, 20 Feb 2013 17:45:53 +0000
(09:45 -0800)
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>
arch/sparc/mm/tsb.c
patch
|
blob
|
history
diff --git
a/arch/sparc/mm/tsb.c
b/arch/sparc/mm/tsb.c
index
7f64743
..
428982b
100644
(file)
--- 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());