Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix up eeb's assertion fix. __GFP_WAIT isn't sufficient, it's GFP_ATOMIC that
[fs/lustre-release.git]
/
lnet
/
include
/
linux
/
kp30.h
diff --git
a/lnet/include/linux/kp30.h
b/lnet/include/linux/kp30.h
index
63eaee7
..
12d9f56
100644
(file)
--- a/
lnet/include/linux/kp30.h
+++ b/
lnet/include/linux/kp30.h
@@
-282,9
+282,8
@@
do { \
#define PORTAL_ALLOC_GFP(ptr, size, mask) \
do { \
#define PORTAL_ALLOC_GFP(ptr, size, mask) \
do { \
- LASSERT (!in_interrupt() || \
- (size <= PORTAL_VMALLOC_SIZE && \
- (mask & __GFP_WAIT) == 0)); \
+ LASSERT(!in_interrupt() || \
+ (size <= PORTAL_VMALLOC_SIZE && mask == GFP_ATOMIC)); \
if ((size) > PORTAL_VMALLOC_SIZE) \
(ptr) = vmalloc(size); \
else \
if ((size) > PORTAL_VMALLOC_SIZE) \
(ptr) = vmalloc(size); \
else \