Merge branch 'master' into export-slabh

[linux-2.6-block.git] / fs / logfs / readwrite.c

diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index c3a3a6814b8412600e7e4fdd54611edc71c84de9..bff40253dfb244df0ece0ddf95407988494f6364 100644 (file)
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -18,6 +18,7 @@
  */
 #include "logfs.h"
 #include <linux/sched.h>
+#include <linux/slab.h>
 
 static u64 adjust_bix(u64 bix, level_t level)
 {