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 'akpm' (patches from Andrew)
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
lustre
/
lustre
/
libcfs
/
tracefile.c
diff --git
a/drivers/staging/lustre/lustre/libcfs/tracefile.c
b/drivers/staging/lustre/lustre/libcfs/tracefile.c
index 973c7c209dfcaab4d4a1a56cb6c87c62407d83b2..f2d018d7823cdeb3f29b48cf970ed5f98b9c49da 100644
(file)
--- a/
drivers/staging/lustre/lustre/libcfs/tracefile.c
+++ b/
drivers/staging/lustre/lustre/libcfs/tracefile.c
@@
-810,7
+810,7
@@
int cfs_trace_allocate_string_buffer(char **str, int nob)
if (nob > 2 * PAGE_CACHE_SIZE) /* string must be "sensible" */
return -EINVAL;
- *str = kmalloc(nob, GFP_
IOFS
| __GFP_ZERO);
+ *str = kmalloc(nob, GFP_
KERNEL
| __GFP_ZERO);
if (*str == NULL)
return -ENOMEM;