git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[safe/jmp/linux-2.6]
/
fs
/
lockd
/
clntproc.c
diff --git
a/fs/lockd/clntproc.c
b/fs/lockd/clntproc.c
index
c81249f
..
7932c39
100644
(file)
--- a/
fs/lockd/clntproc.c
+++ b/
fs/lockd/clntproc.c
@@
-8,6
+8,7
@@
#include <linux/module.h>
#include <linux/smp_lock.h>
+#include <linux/slab.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/fs.h>