diff options
| author | Tejun Heo <tj@kernel.org> | 2014-01-29 00:10:37 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-03 19:24:01 +0100 |
| commit | 1ff6bbfd13ca2c114a5cb58e1a92d1e5d68ce0b7 (patch) | |
| tree | 3ef9611bb58c311a439b1fcdd46329c265c07b5e /kernel/power | |
| parent | Linus 3.14-rc1 (diff) | |
| download | linux-1ff6bbfd13ca2c114a5cb58e1a92d1e5d68ce0b7.tar.xz linux-1ff6bbfd13ca2c114a5cb58e1a92d1e5d68ce0b7.zip | |
arm, pm, vmpressure: add missing slab.h includes
arch/arm/mach-tegra/pm.c, kernel/power/console.c and mm/vmpressure.c
were somehow getting slab.h indirectly through cgroup.h which in turn
was getting it indirectly through xattr.h. A scheduled cgroup change
drops xattr.h inclusion from cgroup.h and breaks compilation of these
three files. Add explicit slab.h includes to the three files.
A pending cgroup patch depends on this change and it'd be great if
this can be routed through cgroup/for-3.14-fixes branch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: linux-tegra@vger.kernel.org
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-pm@vger.kernel.org
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: cgroups@vger.kernel.org
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/console.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c index eacb8bd8cab4..aba9c545a0e3 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c @@ -9,6 +9,7 @@ #include <linux/kbd_kern.h> #include <linux/vt.h> #include <linux/module.h> +#include <linux/slab.h> #include "power.h" #define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1) |