git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
mm
/
hugetlbpage.c
diff --git
a/arch/powerpc/mm/hugetlbpage.c
b/arch/powerpc/mm/hugetlbpage.c
index 6be21e0f9095a64f92cc6d35f6170354f8e6f67c..7372ee13eb1e43e6bcf7cd955b01452dbc696add 100644
(file)
--- a/
arch/powerpc/mm/hugetlbpage.c
+++ b/
arch/powerpc/mm/hugetlbpage.c
@@
-73,7
+73,7
@@
static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,
cachep = PGT_CACHE(pdshift - pshift);
#endif
- new = kmem_cache_zalloc(cachep, GFP_KERNEL
|__GFP_REPEAT
);
+ new = kmem_cache_zalloc(cachep, GFP_KERNEL);
BUG_ON(pshift > HUGEPD_SHIFT_MASK);
BUG_ON((unsigned long)new & HUGEPD_SHIFT_MASK);