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
/
module.c
diff --git
a/drivers/staging/lustre/lustre/libcfs/module.c
b/drivers/staging/lustre/lustre/libcfs/module.c
index 50e8fd23fa17fdf70307b4201fa4018d37ccfac8..07a68594c2791df5c75cbe138564b78008e8aefb 100644
(file)
--- a/
drivers/staging/lustre/lustre/libcfs/module.c
+++ b/
drivers/staging/lustre/lustre/libcfs/module.c
@@
-319,7
+319,7
@@
static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a
struct libcfs_ioctl_data *data;
int err = 0;
- LIBCFS_ALLOC_GFP(buf, 1024, GFP_
IOFS
);
+ LIBCFS_ALLOC_GFP(buf, 1024, GFP_
KERNEL
);
if (buf == NULL)
return -ENOMEM;