[uml-devel] [PATCH] um: Fix compile errors for um architecture

[uml-devel] [PATCH] um: Fix compile errors for um architecture

[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

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 arch/um/drivers/line.c    |    2 +-
 arch/um/os-Linux/helper.c |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 64cda95..7f7338c 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"
@@ -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);
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"
-- 
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
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Re: [uml-devel] [PATCH] um: Fix compile errors for um architecture

[Jan Kiszka]

[-- Attachment #1.1: Type: text/plain, Size: 1704 bytes --]

Lukas Czerner wrote:
> 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

> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> ---
>  arch/um/drivers/line.c    |    2 +-
>  arch/um/os-Linux/helper.c |    1 -
>  2 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
> index 64cda95..7f7338c 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"
> @@ -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);
> 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"



[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

[-- Attachment #2: Type: text/plain, Size: 345 bytes --]

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

[-- Attachment #3: Type: text/plain, Size: 194 bytes --]

_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel