Skip to content
Snippets Groups Projects
Commit ca9d5995 authored by Zach Brown's avatar Zach Brown
Browse files

- fix up eeb's assertion fix. __GFP_WAIT isn't sufficient, it's GFP_ATOMIC that 

  callers use.
parent 3d190eec
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lnet/include/linux/kp30.h
+ 2
− 3
View file @ ca9d5995
...@@ -282,9 +282,8 @@ do { \ ...@@ -282,9 +282,8 @@ do { \
#define PORTAL_ALLOC_GFP(ptr, size, mask) \ #define PORTAL_ALLOC_GFP(ptr, size, mask) \
do { \ do { \
LASSERT (!in_interrupt() || \ LASSERT(!in_interrupt() || \
(size <= PORTAL_VMALLOC_SIZE && \ (size <= PORTAL_VMALLOC_SIZE && mask == GFP_ATOMIC)); \
(mask & __GFP_WAIT) == 0)); \
if ((size) > PORTAL_VMALLOC_SIZE) \ if ((size) > PORTAL_VMALLOC_SIZE) \
(ptr) = vmalloc(size); \ (ptr) = vmalloc(size); \
else \ else \
......
lustre/portals/include/linux/kp30.h
+ 2
− 3
View file @ ca9d5995
...@@ -282,9 +282,8 @@ do { \ ...@@ -282,9 +282,8 @@ do { \
#define PORTAL_ALLOC_GFP(ptr, size, mask) \ #define PORTAL_ALLOC_GFP(ptr, size, mask) \
do { \ do { \
LASSERT (!in_interrupt() || \ LASSERT(!in_interrupt() || \
(size <= PORTAL_VMALLOC_SIZE && \ (size <= PORTAL_VMALLOC_SIZE && mask == GFP_ATOMIC)); \
(mask & __GFP_WAIT) == 0)); \
if ((size) > PORTAL_VMALLOC_SIZE) \ if ((size) > PORTAL_VMALLOC_SIZE) \
(ptr) = vmalloc(size); \ (ptr) = vmalloc(size); \
else \ else \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy