Skip to contentSkip to conversation

uml: Fix build breakage after slab.h changes

PATCH Applied Jan Kiszka 4 participants 10 messages Apr 18, 2010 – Apr 20, 2010 User-mode Linux (UML)

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 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.

---
 arch/um/drivers/line.c    |    1 +
 arch/um/os-Linux/helper.c |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)
arch/um/drivers/line.c +1 -0
index 64cda95..7a656bd 100644
@@ -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"
arch/um/os-Linux/helper.c +0 -1
index 06d6ccf..b6b1096 100644
@@ -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"
#1 lore raw

Hello,

Quoted 3 lines · Jan Kiszka

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.

Hmmm... my test um build was okay but I don't know much about details of um builds. I suppose this patch will go through um tree?

Thanks.

Signature · 1 line
tejun
author
#2 lore raw
Quoted 9 lines · Tejun Heo

Hello,

Quoted 3 lines · Jan Kiszka

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.

Hmmm... my test um build was okay but I don't know much about details of um builds.

We may use different configs. Also, your userland includes have to lack slab.h.

Quoted 1 line

I suppose this patch will go through um tree?

Good question. Does such a tree exist? I'm sitting on a few more um cleanups & fixes, and so far I'm working against Linus' tree as I failed to find anything more recent.

Jan

#3 lore raw
Quoted 3 lines · Jan Kiszka

Good question. Does such a tree exist? I'm sitting on a few more um cleanups & fixes, and so far I'm working against Linus' tree as I failed to find anything more recent.

Well, in that case, I'll route this one through percpu.

Thanks.

Signature · 12 lines
tejun

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
#4 lore raw
In reply to Jan Kiszka
Quoted 5 lines · Jan Kiszka
Quoted 1 line

I suppose this patch will go through um tree?

Good question. Does such a tree exist? I'm sitting on a few more um cleanups & fixes, and so far I'm working against Linus' tree as I failed to find anything more recent.

If these are simple-enough cleanups and/or compile fixes, feel free to send them to [email protected].

Signature · 2 lines
Jiri Kosina
SUSE Labs, Novell Inc.
author
#5 lore raw
Quoted 10 lines · Jiri Kosina
Quoted 4 lines · Jan Kiszka
Quoted 1 line

I suppose this patch will go through um tree?

Good question. Does such a tree exist? I'm sitting on a few more um cleanups & fixes, and so far I'm working against Linus' tree as I failed to find anything more recent.

If these are simple-enough cleanups and/or compile fixes, feel free to send them to [email protected].

Some are trivial, but most aren't. Will check if I can split the formers out, but I guess it's simpler to keep the queue.

Thanks,
Jan

#6 lore raw
Quoted 10 lines · Jan Kiszka
Quoted 8 lines
Quoted 4 lines
Quoted 1 line

I suppose this patch will go through um tree?

Good question. Does such a tree exist? I'm sitting on a few more um cleanups & fixes, and so far I'm working against Linus' tree as I failed to find anything more recent.

If these are simple-enough cleanups and/or compile fixes, feel free to send them to [email protected].

Some are trivial, but most aren't. Will check if I can split the formers out, but I guess it's simpler to keep the queue.

Well, if Jeff isn't actively maintaining UML any more, either you can take over the maintainership yourself, or feed the non-trivial patches through Andrew Morton.

Signature · 2 lines
Jiri Kosina
SUSE Labs, Novell Inc.
#7 lore raw
Quoted 3 lines · Jiri Kosina

Well, if Jeff isn't actively maintaining UML any more, either you can take over the maintainership yourself, or feed the non-trivial patches through Andrew Morton.

Yes, these generally go through Andrew.

Jeff

Signature · 1 line
Work email - jdike at linux dot intel dot com
author
#8 lore raw
Quoted 6 lines · Jeff Dike
Quoted 3 lines · Jiri Kosina

Well, if Jeff isn't actively maintaining UML any more, either you can take over the maintainership yourself, or feed the non-trivial patches through Andrew Morton.

Yes, these generally go through Andrew.

OK, thanks. Just need to finish my IRQ handlers review / IRQF_DISABLED cleanups, then I will roll it out.

Jan

PS: If you have any comments regarding the pthread topic, please let me know.

Applied
#9 lore raw
In reply to Jan Kiszka
Quoted 5 lines · Jan Kiszka

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.

applied to percpu#for-linus/next. Will push to Linus in a few days.

Thanks.

Signature · 1 line
tejun