diff options
| author |   Jan Kiszka <jan.kiszka@web.de> | 2010-04-19 17:46:23 +0900 |
|---|---|---|
| committer |   Tejun Heo <tj@kernel.org> | 2010-04-19 17:46:23 +0900 |
| commit | 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c (patch) | |
| tree | a8a1c7c333481e108de78a854d85a7bb9f84e43b /arch/um | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel (diff) | |
| download | linux-dev-7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c.tar.xz linux-dev-7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c.zip | |
uml: Fix build breakage after slab.h changes
We now have to to include linux/slab.h explicitly for kmalloc &
friends. Files that build against host headers already get their
prototypes via um_malloc.h, linux/slab.h may even be unavailable.
Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/line.c | 1 | ||||
| -rw-r--r-- | arch/um/os-Linux/helper.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 64cda95f59ca..7a656bd8bd3c 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -6,6 +6,7 @@ #include "linux/irqreturn.h" #include "linux/kd.h" #include "linux/sched.h" +#include "linux/slab.h" #include "chan_kern.h" #include "irq_kern.h" #include "irq_user.h" diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index 06d6ccf0e444..b6b1096152aa 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c @@ -8,7 +8,6 @@ #include <errno.h> #include <sched.h> #include <linux/limits.h> -#include <linux/slab.h> #include <sys/socket.h> #include <sys/wait.h> #include "kern_constants.h" |