Skip to contentSkip to conversation

um: Fix compile errors for um architecture

PATCH In review Lukas Czerner 2 participants 2 messages Apr 19, 2010 User-mode Linux (UML)

lore
Share & tools
lore

Lukas Czerner

author
#0 lore raw

PATCH 1/1 um: Fix compile errors for um architecture

arch/um/drivers/line.c
- need to include linux/slab.h since the code uses kmalloc.
- fix warning message with unused variable tty

arch/um/os-Linux/helper.c
- there is no need to include linux/slab.h since allocations are done with uml_kmalloc

Signed-off-by Lukas Czerner <[email protected]>
---
 arch/um/drivers/line.c    |    2 +-
 arch/um/os-Linux/helper.c |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)
arch/um/drivers/line.c +1 -1
index 64cda95..7f7338c 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"

@@ -18,7 +19,6 @@ static irqreturn_t line_interrupt(int irq, void *data)
 {
 	struct chan *chan = data;
 	struct line *line = chan->line;
-	struct tty_struct *tty;
 
 	if (line)
 		chan_interrupt(&line->chan_list, &line->task, line->tty, irq);
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"
Signature · 13 lines
1.6.6.1


------------------------------------------------------------------------------
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
#1 lore raw
Quoted 7 lines · Lukas Czerner

arch/um/drivers/line.c
- need to include linux/slab.h since the code uses kmalloc.
- fix warning message with unused variable tty

arch/um/os-Linux/helper.c
- there is no need to include linux/slab.h since allocations are done with uml_kmalloc

The build fixes are already queued in Tejun's percpu tree, the variable removal is part of my just posted trivial series. But what an amazing activity here! :)

Thanks,
Jan

Quoted 32 lines
Signed-off-by Lukas Czerner <[email protected]>
---
 arch/um/drivers/line.c    |    2 +-
 arch/um/os-Linux/helper.c |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)
arch/um/drivers/line.c +1 -1
index 64cda95..7f7338c 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"

@@ -18,7 +19,6 @@ static irqreturn_t line_interrupt(int irq, void *data)
 {
 	struct chan *chan = data;
 	struct line *line = chan->line;
-	struct tty_struct *tty;
 
 	if (line)
 		chan_interrupt(&line->chan_list, &line->task, line->tty, irq);
arch/um/os-Linux/helper.c +0 -0
index 06d6ccf..b6b1096 100644

arch/um/os-Linux/helper.c line 13

Quoted 7 lines
arch/um/os-Linux/helper.c +0 -1
@@ -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"

------------------------------------------------------------------------------
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