git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[sfrench/cifs-2.6.git]
/
fs
/
lockd
/
svclock.c
diff --git
a/fs/lockd/svclock.c
b/fs/lockd/svclock.c
index d1001790fa9ac77569ede0eae646b7b116f2211f..84055d31bfc5e427a87c2412eea17f6ea59e2fc4 100644
(file)
--- a/
fs/lockd/svclock.c
+++ b/
fs/lockd/svclock.c
@@
-21,6
+21,7
@@
*/
#include <linux/types.h>
+#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/sched.h>