diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 15:37:14 (GMT) |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 15:37:14 (GMT) |
| commit | 1a698a4aba26dd58e8409d325a9a9db22f7cd2db (patch) | |
| tree | bc4b414c7eca762c0bac1176bd1d63b74c9f965e /mm | |
| parent | 3417ae1f5f59bbf36c3defbbf2a76c5ca498db2a (diff) | |
| parent | 48573a893303986e3b0b2974d6fb11f3d1bb7064 (diff) | |
| download | linux-1a698a4aba26dd58e8409d325a9a9db22f7cd2db.tar.xz | |
Merge branch 'for-3.14-fixes' into for-3.15
Pending kernfs conversion depends on fixes in for-3.14-fixes. Pull it
into for-3.15.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/vmpressure.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/vmpressure.c b/mm/vmpressure.c index 196970a..d4042e7 100644 --- a/mm/vmpressure.c +++ b/mm/vmpressure.c @@ -19,6 +19,7 @@ #include <linux/mm.h> #include <linux/vmstat.h> #include <linux/eventfd.h> +#include <linux/slab.h> #include <linux/swap.h> #include <linux/printk.h> #include <linux/vmpressure.h> |