projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.open-osd.org/linux-open-osd
[firefly-linux-kernel-4.4.55.git]
/
fs
/
dlm
/
midcomms.c
diff --git
a/fs/dlm/midcomms.c
b/fs/dlm/midcomms.c
index 07ac709f3ed7145853b67fd5b36618e759092ba5..f3396c622aecc04ef371ccf9cb3baed23b110c55 100644
(file)
--- a/
fs/dlm/midcomms.c
+++ b/
fs/dlm/midcomms.c
@@
-112,7
+112,7
@@
int dlm_process_incoming_buffer(int nodeid, const void *base,
ordinary messages). */
if (msglen > sizeof(__tmp) && p == &__tmp.p) {
- p = kmalloc(dlm_config.ci_buffer_size, GFP_
KERNEL
);
+ p = kmalloc(dlm_config.ci_buffer_size, GFP_
NOFS
);
if (p == NULL)
return ret;
}