Merge branch 'master' into export-slabh

[linux-2.6-block.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index b1f6e62773d3bbcebb8e314a446e9097e1656dc0..7621db800a74b85d440055f590acf10daeb67550 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -81,6 +81,7 @@
 #include <linux/elf.h>
 #include <linux/pid_namespace.h>
 #include <linux/fs_struct.h>
+#include <linux/slab.h>
 #include "internal.h"
 
 /* NOTE: