mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@web.de>
To: Jeff Dike <jdike@addtoit.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	user-mode-linux-devel@lists.sourceforge.net,
	Tejun Heo <tj@kernel.org>, Tiger Yang <tiger.yang@oracle.com>
Subject: [PATCH] uml: Fix build breakage after slab.h changes
Date: Sun, 18 Apr 2010 18:37:14 +0200	[thread overview]
Message-ID: <4BCB353A.3040806@web.de> (raw)

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>
---
 arch/um/drivers/line.c    |    1 +
 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 64cda95..7a656bd 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 06d6ccf..b6b1096 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"


             reply	other threads:[~2010-04-18 16:37 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-18 16:37 Jan Kiszka [this message]
2010-04-18 21:24 ` Tejun Heo
2010-04-19  7:35   ` Jan Kiszka
2010-04-19  8:19     ` Tejun Heo
2010-04-19 16:29     ` Jiri Kosina
2010-04-19 20:10       ` Jan Kiszka
2010-04-19 20:12         ` Jiri Kosina
2010-04-20 14:31           ` Jeff Dike
2010-04-20 17:11             ` Jan Kiszka
2010-04-19  8:51 ` Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BCB353A.3040806@web.de \
    --to=jan.kiszka@web.de \
    --cc=jdike@addtoit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tiger.yang@oracle.com \
    --cc=tj@kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome