uml: Some trivial cleanups

PATCH Applied Jan Kiszka 4 participants 28 messages Apr 19, 2010 – May 10, 2010

Subsystems (2)

exec and binfmt User-mode Linux (UML)

lore

Share & tools

lore

Jan Kiszka

author

2010-04-19 21:53 UTC #0 lore raw

cover uml: Some trivial cleanups

Some trivial build warning fixes and cleanups for UML.

Jan Kiszka (5):
uml: Remove unused variable from line driver
uml: Drop private round_down definition
uml: Fix warning due to missing task_struct declaration
uml: i386: Avoid redefinition of NR_syscalls
uml: Clean up asm/system.h

 arch/um/drivers/line.c        |    1 -
 arch/um/include/asm/system.h  |    3 ---
 arch/um/kernel/skas/syscall.c |    4 ++--
 arch/um/sys-i386/asm/elf.h    |    2 ++
 arch/um/sys-x86_64/asm/elf.h  |    2 ++
 arch/um/sys-x86_64/signal.c   |    2 --
 6 files changed, 6 insertions(+), 8 deletions(-)

Jan Kiszka

author

2010-04-19 21:53 UTC #1 lore raw

PATCH 1/5 uml: Remove unused variable from line driver

Signed-off-by Jan Kiszka <[email protected]>

---
 arch/um/drivers/line.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

arch/um/drivers/line.c +0 -1

index 7a656bd..7f7338c 100644
@@ -19,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);

Signature · 1 line

1.6.0.2

Amerigo Wang

Acked-by on v1 1/5

2010-04-20 08:28 UTC #2 lore raw

Re: [PATCH 1/5] uml: Remove unused variable from line driver

Quoted 1 line · Jan Kiszka

Signed-off-by Jan Kiszka <[email protected]>

Acked-by WANG Cong <[email protected]>

Quoted 24 lines

---
arch/um/drivers/line.c | 1 -

1 files changed, 0 insertions(+), 1 deletions(-)

arch/um/drivers/line.c +0 -1

index 7a656bd..7f7338c 100644
@@ -19,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);

Signature · 7 lines

1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Jiri Kosina

Applied

2010-04-20 14:31 UTC #3 lore raw

Re: [PATCH 1/5] uml: Remove unused variable from line driver

In reply to Jan Kiszka

Quoted 10 lines · Jan Kiszka

Signed-off-by Jan Kiszka <[email protected]>
---
 arch/um/drivers/line.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/um/drivers/line.c +0 -0
index 7a656bd..7f7338c 100644

arch/um/drivers/line.c static irqreturn_t line_interrupt(int irq, void *data) · line 24

Quoted 7 lines

arch/um/drivers/line.c +0 -1

@@ -19,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);

Applied, thanks.

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.

Jan Kiszka

author

2010-04-19 21:53 UTC #4 lore raw

PATCH 2/5 uml: Drop private round_down definition

In reply to Jan Kiszka

Already defined in kernel.h. The official version assumes that 'n' is power of two - which it is in our case.

Signed-off-by Jan Kiszka <[email protected]>

---
 arch/um/sys-x86_64/signal.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

arch/um/sys-x86_64/signal.c +0 -2

index 1a899a7..07797d1 100644
@@ -165,8 +165,6 @@ struct rt_sigframe
 	struct _fpstate fpstate;
 };
 
-#define round_down(m, n) (((m) / (n)) * (n))
-
 int setup_signal_stack_si(unsigned long stack_top, int sig,
 			  struct k_sigaction *ka, struct pt_regs * regs,
 			  siginfo_t *info, sigset_t *set)

Signature · 1 line

1.6.0.2

Amerigo Wang

2010-04-20 08:33 UTC #5 lore raw

Re: [PATCH 2/5] uml: Drop private round_down definition

Quoted 13 lines · Jan Kiszka

Already defined in kernel.h. The official version assumes that 'n' is power of two - which it is in our case.
Signed-off-by Jan Kiszka <[email protected]>
---
arch/um/sys-x86_64/signal.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
arch/um/sys-x86_64/signal.c +0 -0
index 1a899a7..07797d1 100644

arch/um/sys-x86_64/signal.c struct rt_sigframe · line 170

Quoted 8 lines

arch/um/sys-x86_64/signal.c +0 -2

@@ -165,8 +165,6 @@ struct rt_sigframe
 	struct _fpstate fpstate;
 };
 
-#define round_down(m, n) (((m) / (n)) * (n))
-
 int setup_signal_stack_si(unsigned long stack_top, int sig,
 			  struct k_sigaction *ka, struct pt_regs * regs,
 			  siginfo_t *info, sigset_t *set)

Shouldn't this signal.c #include <linux/kernel.h>?

Thanks.

Jeff Dike

2010-04-20 14:25 UTC #6 lore raw

Re: [PATCH 2/5] uml: Drop private round_down definition

Quoted 17 lines · Amerigo Wang

Quoted 16 lines · Jan Kiszka
Already defined in kernel.h. The official version assumes that 'n' is power of two - which it is in our case.
Signed-off-by Jan Kiszka <[email protected]>
---
arch/um/sys-x86_64/signal.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
arch/um/sys-x86_64/signal.c +0 -0
index 1a899a7..07797d1 100644
@@ -165,8 +165,6 @@ struct rt_sigframe
 	struct _fpstate fpstate;
 };
 

Quoted 7 lines

arch/um/sys-x86_64/signal.c struct rt_sigframe · line 170
Quoted 5 lines
arch/um/sys-x86_64/signal.c +0 -2
-#define round_down(m, n) (((m) / (n)) * (n))
-
 int setup_signal_stack_si(unsigned long stack_top, int sig,
 			  struct k_sigaction *ka, struct pt_regs * regs,
 			  siginfo_t *info, sigset_t *set)
Shouldn't this signal.c #include <linux/kernel.h>?

I agree - if this is going to depend on kernel.h, it should be explicitly included.

Jeff

Jiri Kosina

2010-04-20 15:49 UTC #7 lore raw

Re: [PATCH 2/5] uml: Drop private round_down definition

Quoted 24 lines · Jeff Dike

Quoted 16 lines
Quoted 16 lines
Already defined in kernel.h. The official version assumes that 'n' is power of two - which it is in our case.
Signed-off-by Jan Kiszka <[email protected]>
---
arch/um/sys-x86_64/signal.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
arch/um/sys-x86_64/signal.c +0 -0
index 1a899a7..07797d1 100644
@@ -165,8 +165,6 @@ struct rt_sigframe
 	struct _fpstate fpstate;
 };
 
Quoted 7 lines
arch/um/sys-x86_64/signal.c struct rt_sigframe · line 170
Quoted 5 lines
arch/um/sys-x86_64/signal.c +0 -2
-#define round_down(m, n) (((m) / (n)) * (n))
-
 int setup_signal_stack_si(unsigned long stack_top, int sig,
 			  struct k_sigaction *ka, struct pt_regs * regs,
 			  siginfo_t *info, sigset_t *set)
Shouldn't this signal.c #include <linux/kernel.h>?

Quoted 2 lines

I agree - if this is going to depend on kernel.h, it should be explicitly included.

Yup, I have already added that.

Thanks,

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.

Jiri Kosina

Applied

2010-04-20 14:35 UTC #8 lore raw

Re: [PATCH 2/5] uml: Drop private round_down definition

In reply to Amerigo Wang

Quoted 17 lines · Amerigo Wang

Quoted 16 lines · Jan Kiszka
Already defined in kernel.h. The official version assumes that 'n' is power of two - which it is in our case.
Signed-off-by Jan Kiszka <[email protected]>
---
arch/um/sys-x86_64/signal.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
arch/um/sys-x86_64/signal.c +0 -0
index 1a899a7..07797d1 100644
@@ -165,8 +165,6 @@ struct rt_sigframe
 	struct _fpstate fpstate;
 };
 

Quoted 7 lines

arch/um/sys-x86_64/signal.c struct rt_sigframe · line 170
Quoted 5 lines
arch/um/sys-x86_64/signal.c +0 -2
-#define round_down(m, n) (((m) / (n)) * (n))
-
 int setup_signal_stack_si(unsigned long stack_top, int sig,
 			  struct k_sigaction *ka, struct pt_regs * regs,
 			  siginfo_t *info, sigset_t *set)
Shouldn't this signal.c #include <linux/kernel.h>?

Well, it gets included implicitly through uaccess.h -> sched.h -> kernel.h.

Applied, thanks.

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.

Jeff Dike

2010-04-20 16:52 UTC #9 lore raw

Re: [uml-devel] [PATCH 2/5] uml: Drop private round_down definition

Quoted 5 lines · Jiri Kosina

Quoted 1 line · Amerigo Wang
Shouldn't this signal.c #include <linux/kernel.h>?
Well, it gets included implicitly through uaccess.h -> sched.h -> kernel.h.

You're depending on the internal details of uaccess.h and sched.h. If either of them changed, then this would cause unexpected compile failures here.

Better to explicitly include kernel.h.

Jeff

Signature · 1 line

Work email - jdike at linux dot intel dot com

Jiri Kosina

2010-04-20 17:18 UTC #10 lore raw

Re: [uml-devel] [PATCH 2/5] uml: Drop private round_down definition

Quoted 10 lines · Jeff Dike

Quoted 4 lines
Quoted 1 line
Shouldn't this signal.c #include <linux/kernel.h>?
Well, it gets included implicitly through uaccess.h -> sched.h -> kernel.h.
You're depending on the internal details of uaccess.h and sched.h. If either of them changed, then this would cause unexpected compile failures here.
Better to explicitly include kernel.h.

Yeah, I have that already in my tree.

Thanks,

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.

Jan Kiszka

author

2010-04-19 21:53 UTC #11 lore raw

PATCH 3/5 uml: Fix warning due to missing task_struct declaration

In reply to Jan Kiszka

We can't pull in linux/sched.h, so just declare the struct.

Signed-off-by Jan Kiszka <[email protected]>

---
 arch/um/sys-i386/asm/elf.h   |    2 ++
 arch/um/sys-x86_64/asm/elf.h |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

arch/um/sys-i386/asm/elf.h +2 -0

index e64cd41..a979a22 100644
@@ -75,6 +75,8 @@ typedef struct user_i387_struct elf_fpregset_t;
 	pr_reg[16] = PT_REGS_SS(regs);		\
 } while (0);
 
+struct task_struct;
+
 extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu);
 
 #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu)

arch/um/sys-x86_64/asm/elf.h +2 -0

index 49655c8..d760967 100644
@@ -95,6 +95,8 @@ typedef struct user_i387_struct elf_fpregset_t;
 	(pr_reg)[25] = 0;					\
 	(pr_reg)[26] = 0;
 
+struct task_struct;
+
 extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu);
 
 #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu)

Signature · 1 line

1.6.0.2

Amerigo Wang

2010-04-20 10:06 UTC #12 lore raw

Re: [PATCH 3/5] uml: Fix warning due to missing task_struct declaration

Quoted 2 lines · Jan Kiszka

We can't pull in linux/sched.h, so just declare the struct.

Did you meet any build error? If yes, please include it.

Thanks.

Quoted 40 lines

Signed-off-by Jan Kiszka <[email protected]>

---

arch/um/sys-i386/asm/elf.h   |    2 ++
arch/um/sys-x86_64/asm/elf.h |    2 ++
2 files changed, 4 insertions(+), 0 deletions(-)

arch/um/sys-i386/asm/elf.h +2 -0

index e64cd41..a979a22 100644
@@ -75,6 +75,8 @@ typedef struct user_i387_struct elf_fpregset_t;
 	pr_reg[16] = PT_REGS_SS(regs);		\
 } while (0);
 
+struct task_struct;
+
 extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu);
 
 #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu)

arch/um/sys-x86_64/asm/elf.h +2 -0

index 49655c8..d760967 100644
@@ -95,6 +95,8 @@ typedef struct user_i387_struct elf_fpregset_t;
 	(pr_reg)[25] = 0;					\
 	(pr_reg)[26] = 0;
 
+struct task_struct;
+
 extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu);
 
 #define ELF_CORE_COPY_FPREGS(t, fpu) elf_core_copy_fpregs(t, fpu)

Signature · 7 lines

1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Jeff Dike

2010-04-20 14:30 UTC #13 lore raw

Re: [PATCH 3/5] uml: Fix warning due to missing task_struct declaration

Quoted 5 lines · Amerigo Wang

Quoted 2 lines · Jan Kiszka
We can't pull in linux/sched.h, so just declare the struct.
Did you meet any build error? If yes, please include it.

What does this patch fix, aside from being a bit cleaner?

If it built before, without having a task_struct declaration, I think that means that the elf_core_copy_fpregs was never used. The task_struct * in the declaration would become a private task_struct, known only to the declaration. If the implementation or callers have the regular task_struct, it will be a different one, and the prototypes will conflict due to the different types of the first parameter.

Jeff

Signature · 1 line

Work email - jdike at linux dot intel dot com

Jan Kiszka

author

2010-04-20 17:09 UTC #14 lore raw

Re: [PATCH 3/5] uml: Fix warning due to missing task_struct declaration

Quoted 7 lines · Jeff Dike

Quoted 4 lines · Amerigo Wang
Quoted 2 lines · Jan Kiszka
We can't pull in linux/sched.h, so just declare the struct.
Did you meet any build error? If yes, please include it.
What does this patch fix, aside from being a bit cleaner?

CC arch/um/sys-i386/elfcore.o
In file included from /data/linux-2.6/include/linux/elf.h:8,

                 from /data/linux-2.6/arch/um/sys-i386/elfcore.c:2:

/data/linux-2.6/arch/um/sys-i386/asm/elf.h:78: warning: ‘struct task_struct’ declared inside parameter list /data/linux-2.6/arch/um/sys-i386/asm/elf.h:78: warning: its scope is only this definition or declaration, which is probably not what you want

I guess not many people build against i386 hosts anymore, so this remained widely unnoticed.

Quoted 8 lines

If it built before, without having a task_struct declaration, I think that means that the elf_core_copy_fpregs was never used. The task_struct * in the declaration would become a private task_struct, known only to the declaration. If the implementation or callers have the regular task_struct, it will be a different one, and the prototypes will conflict due to the different types of the first parameter.

This is just a forward declaration (that many arch elf header include), so no such problem exists.

BTW, to answer the other question in this thread: We have a circular dependency that prevents including sched.h.

I can add all these information to some v2 of this patch if it is required to get this merged. Please let me know.

Jan

Jiri Kosina

2010-04-20 23:43 UTC #15 lore raw

Re: [PATCH 3/5] uml: Fix warning due to missing task_struct declaration

Quoted 24 lines · Jan Kiszka

Quoted 5 lines
Quoted 3 lines
Quoted 2 lines
We can't pull in linux/sched.h, so just declare the struct.
Did you meet any build error? If yes, please include it.
What does this patch fix, aside from being a bit cleaner?
CC arch/um/sys-i386/elfcore.o
In file included from /data/linux-2.6/include/linux/elf.h:8,
                 from /data/linux-2.6/arch/um/sys-i386/elfcore.c:2:
/data/linux-2.6/arch/um/sys-i386/asm/elf.h:78: warning: ‘struct task_struct’ declared inside parameter list /data/linux-2.6/arch/um/sys-i386/asm/elf.h:78: warning: its scope is only this definition or declaration, which is probably not what you want
I guess not many people build against i386 hosts anymore, so this remained widely unnoticed.
Quoted 8 lines
If it built before, without having a task_struct declaration, I think that means that the elf_core_copy_fpregs was never used. The task_struct * in the declaration would become a private task_struct, known only to the declaration. If the implementation or callers have the regular task_struct, it will be a different one, and the prototypes will conflict due to the different types of the first parameter.

Quoted 8 lines

This is just a forward declaration (that many arch elf header include), so no such problem exists.
BTW, to answer the other question in this thread: We have a circular dependency that prevents including sched.h.
I can add all these information to some v2 of this patch if it is required to get this merged. Please let me know.

I have updated the explanation in the changelog and applied the patch. If anyone has any objections still, please let me know.

Thanks,

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.

Amerigo Wang

2010-04-21 06:03 UTC #16 lore raw

Re: [PATCH 3/5] uml: Fix warning due to missing task_struct declaration

In reply to Jan Kiszka

Quoted 27 lines · Jan Kiszka

Quoted 7 lines · Jeff Dike
Quoted 4 lines · Amerigo Wang
Quoted 2 lines · Jan Kiszka
We can't pull in linux/sched.h, so just declare the struct.
Did you meet any build error? If yes, please include it.
What does this patch fix, aside from being a bit cleaner?
CC arch/um/sys-i386/elfcore.o
In file included from /data/linux-2.6/include/linux/elf.h:8,
                from /data/linux-2.6/arch/um/sys-i386/elfcore.c:2:
/data/linux-2.6/arch/um/sys-i386/asm/elf.h:78: warning: ‘struct task_struct’ declared inside parameter list /data/linux-2.6/arch/um/sys-i386/asm/elf.h:78: warning: its scope is only this definition or declaration, which is probably not what you want
I guess not many people build against i386 hosts anymore, so this remained widely unnoticed.
Quoted 8 lines
If it built before, without having a task_struct declaration, I think that means that the elf_core_copy_fpregs was never used. The task_struct * in the declaration would become a private task_struct, known only to the declaration. If the implementation or callers have the regular task_struct, it will be a different one, and the prototypes will conflict due to the different types of the first parameter.

Quoted 5 lines

This is just a forward declaration (that many arch elf header include), so no such problem exists.
BTW, to answer the other question in this thread: We have a circular dependency that prevents including sched.h.

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This is the right reason to do this. Ok then, thanks.

But it looks like x86_64 needs this too.

BTW, I don't think compile warning fixes are trivial enough to go to [email protected].

------------------------------------------------------------------------------
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Jiri Kosina

2010-04-21 09:38 UTC #17 lore raw

Re: [PATCH 3/5] uml: Fix warning due to missing task_struct declaration

Quoted 23 lines · Amerigo Wang

Quoted 18 lines
CC arch/um/sys-i386/elfcore.o
In file included from /data/linux-2.6/include/linux/elf.h:8,
                from /data/linux-2.6/arch/um/sys-i386/elfcore.c:2:
/data/linux-2.6/arch/um/sys-i386/asm/elf.h:78: warning: ‘struct task_struct’ declared inside parameter list /data/linux-2.6/arch/um/sys-i386/asm/elf.h:78: warning: its scope is only this definition or declaration, which is probably not what you want
I guess not many people build against i386 hosts anymore, so this remained widely unnoticed.
Quoted 8 lines
If it built before, without having a task_struct declaration, I think that means that the elf_core_copy_fpregs was never used. The task_struct * in the declaration would become a private task_struct, known only to the declaration. If the implementation or callers have the regular task_struct, it will be a different one, and the prototypes will conflict due to the different types of the first parameter.
Quoted 5 lines
This is just a forward declaration (that many arch elf header include), so no such problem exists.
BTW, to answer the other question in this thread: We have a circular dependency that prevents including sched.h.

Quoted 8 lines

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This is the right reason to do this. Ok then, thanks.
But it looks like x86_64 needs this too.
BTW, I don't think compile warning fixes are trivial enough to go to [email protected].

Why?

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.

Amerigo Wang

2010-04-21 10:40 UTC #18 lore raw

Re: [PATCH 3/5] uml: Fix warning due to missing task_struct declaration

Quoted 7 lines · Jiri Kosina

Quoted 3 lines · Amerigo Wang
BTW, I don't think compile warning fixes are trivial enough to go to [email protected].
Why?

Usually compile warnings fixes go into -mm, some coding style fixes too.

Jiri Kosina

2010-04-21 10:49 UTC #19 lore raw

Re: [PATCH 3/5] uml: Fix warning due to missing task_struct declaration

Quoted 7 lines · Amerigo Wang

Quoted 5 lines
Quoted 2 lines
BTW, I don't think compile warning fixes are trivial enough to go to [email protected].
Why?
Usually compile warnings fixes go into -mm, some coding style fixes too.

Well, I personally don't care that much, submit your patches whereever you wish.

The point of trivial tree is to take off load from other maintainers (including Andrew) so that focusing on The Real Things is possible.

See relevant section of Documentation/SubmittingPatches.

But, as I said, I don't care that much. If you want to avoid trivial tree for some reason, feel free to do so.

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.

Jan Kiszka

author

2010-04-19 21:53 UTC #20 lore raw

PATCH 4/5 uml: i386: Avoid redefinition of NR_syscalls

In reply to Jan Kiszka

The i386 subarch happens to pull in original NR_syscalls. Maybe we can make that work for all host arch, but for now just avoid the clash by using an all-upper-case name.

Signed-off-by Jan Kiszka <[email protected]>

---
 arch/um/kernel/skas/syscall.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/um/kernel/skas/syscall.c +2 -2

index 4e3b820..f5173e1 100644
@@ -10,7 +10,7 @@
 #include "sysdep/syscalls.h"
 
 extern int syscall_table_size;
-#define NR_syscalls (syscall_table_size / sizeof(void *))
+#define NR_SYSCALLS (syscall_table_size / sizeof(void *))
 
 void handle_syscall(struct uml_pt_regs *r)
 {

@@ -30,7 +30,7 @@ void handle_syscall(struct uml_pt_regs *r)
 	 * in case it's a compiler bug.
 	 */
 	syscall = UPT_SYSCALL_NR(r);
-	if ((syscall >= NR_syscalls) || (syscall < 0))
+	if ((syscall >= NR_SYSCALLS) || (syscall < 0))
 		result = -ENOSYS;
 	else result = EXECUTE_SYSCALL(syscall, regs);

Signature · 1 line

1.6.0.2

Amerigo Wang

2010-04-20 10:07 UTC #21 lore raw

Re: [PATCH 4/5] uml: i386: Avoid redefinition of NR_syscalls

Quoted 4 lines · Jan Kiszka

The i386 subarch happens to pull in original NR_syscalls. Maybe we can make that work for all host arch, but for now just avoid the clash by using an all-upper-case name.

Where?

Quoted 35 lines

Signed-off-by Jan Kiszka <[email protected]>

---
arch/um/kernel/skas/syscall.c | 4 ++--

1 files changed, 2 insertions(+), 2 deletions(-)

arch/um/kernel/skas/syscall.c +2 -2

index 4e3b820..f5173e1 100644
@@ -10,7 +10,7 @@
 #include "sysdep/syscalls.h"
 
 extern int syscall_table_size;
-#define NR_syscalls (syscall_table_size / sizeof(void *))
+#define NR_SYSCALLS (syscall_table_size / sizeof(void *))
 
 void handle_syscall(struct uml_pt_regs *r)
 {

@@ -30,7 +30,7 @@ void handle_syscall(struct uml_pt_regs *r)
 	 * in case it's a compiler bug.
 	 */
 	syscall = UPT_SYSCALL_NR(r);
-	if ((syscall >= NR_syscalls) || (syscall < 0))
+	if ((syscall >= NR_SYSCALLS) || (syscall < 0))
 		result = -ENOSYS;
 	else result = EXECUTE_SYSCALL(syscall, regs);

Signature · 7 lines

1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Jan Kiszka

author

2010-04-20 17:14 UTC #22 lore raw

Re: [PATCH 4/5] uml: i386: Avoid redefinition of NR_syscalls

Quoted 7 lines · Amerigo Wang

Quoted 4 lines · Jan Kiszka
The i386 subarch happens to pull in original NR_syscalls. Maybe we can make that work for all host arch, but for now just avoid the clash by using an all-upper-case name.
Where?

Not sure if this answers your question:

CC arch/um/kernel/skas/syscall.o
/data/linux-2.6/arch/um/kernel/skas/syscall.c:13:1: warning:
"NR_syscalls" redefined
In file included from /data/linux-2.6/arch/x86/include/asm/unistd.h:3,
from
/data/linux-2.6/arch/um/sys-i386/shared/sysdep/syscalls.h:6,

                 from /data/linux-2.6/arch/um/kernel/skas/syscall.c:10:

/data/linux-2.6/arch/x86/include/asm/unistd_32.h:349:1: warning: this is the location of the previous definition

Jan

Amerigo Wang

2010-04-21 06:08 UTC #23 lore raw

Re: [PATCH 4/5] uml: i386: Avoid redefinition of NR_syscalls

Quoted 17 lines · Jan Kiszka

Quoted 7 lines · Amerigo Wang
Quoted 4 lines · Jan Kiszka
The i386 subarch happens to pull in original NR_syscalls. Maybe we can make that work for all host arch, but for now just avoid the clash by using an all-upper-case name.
Where?
Not sure if this answers your question:
CC arch/um/kernel/skas/syscall.o
/data/linux-2.6/arch/um/kernel/skas/syscall.c:13:1: warning:
"NR_syscalls" redefined
In file included from /data/linux-2.6/arch/x86/include/asm/unistd.h:3,
from
/data/linux-2.6/arch/um/sys-i386/shared/sysdep/syscalls.h:6,

Quoted 4 lines

                from /data/linux-2.6/arch/um/kernel/skas/syscall.c:10:
/data/linux-2.6/arch/x86/include/asm/unistd_32.h:349:1: warning: this is the location of the previous definition

Ah, sure. I misunderstood your purpose, please do include the warning messages you are trying to fix in your patch description.

Thanks!

Jiri Kosina

2010-05-10 21:38 UTC #24 lore raw

Re: [PATCH 4/5] uml: i386: Avoid redefinition of NR_syscalls

Quoted 15 lines · Amerigo Wang

Quoted 10 lines
Quoted 1 line
Where?
Not sure if this answers your question:
CC arch/um/kernel/skas/syscall.o
/data/linux-2.6/arch/um/kernel/skas/syscall.c:13:1: warning:
"NR_syscalls" redefined
In file included from /data/linux-2.6/arch/x86/include/asm/unistd.h:3,
from
/data/linux-2.6/arch/um/sys-i386/shared/sysdep/syscalls.h:6,
Quoted 4 lines
                from /data/linux-2.6/arch/um/kernel/skas/syscall.c:10:
/data/linux-2.6/arch/x86/include/asm/unistd_32.h:349:1: warning: this is the location of the previous definition

Quoted 2 lines

Ah, sure. I misunderstood your purpose, please do include the warning messages you are trying to fix in your patch description.

The patch doesn't seem to be present in linux-next as of today. I have applied it to my queue.

Thanks,

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.

Jan Kiszka

author

2010-04-19 21:53 UTC #25 lore raw

PATCH 5/5 uml: Clean up asm/system.h

In reply to Jan Kiszka

Remove duplicates and unused prototypes.

Signed-off-by Jan Kiszka <[email protected]>

---
 arch/um/include/asm/system.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

arch/um/include/asm/system.h +0 -3

index 753346e..93af1cf 100644
@@ -3,11 +3,8 @@
 
 #include "sysdep/system.h"
 
-extern void *switch_to(void *prev, void *next, void *last);
-
 extern int get_signals(void);
 extern int set_signals(int enable);
-extern int get_signals(void);
 extern void block_signals(void);
 extern void unblock_signals(void);

Signature · 1 line

1.6.0.2

Amerigo Wang

Acked-by on v1 5/5

2010-04-20 10:10 UTC #26 lore raw

Re: [PATCH 5/5] uml: Clean up asm/system.h

Quoted 3 lines · Jan Kiszka

Remove duplicates and unused prototypes.
Signed-off-by Jan Kiszka <[email protected]>

Acked-by WANG Cong <[email protected]>

Quoted 28 lines

---
arch/um/include/asm/system.h | 3 ---

1 files changed, 0 insertions(+), 3 deletions(-)

arch/um/include/asm/system.h +0 -3

index 753346e..93af1cf 100644
@@ -3,11 +3,8 @@
 
 #include "sysdep/system.h"
 
-extern void *switch_to(void *prev, void *next, void *last);
-
 extern int get_signals(void);
 extern int set_signals(int enable);
-extern int get_signals(void);
 extern void block_signals(void);
 extern void unblock_signals(void);

Signature · 7 lines

1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Jiri Kosina

Applied

2010-04-20 14:33 UTC #27 lore raw

Re: [PATCH 5/5] uml: Clean up asm/system.h

In reply to Jan Kiszka

Quoted 3 lines · Jan Kiszka

Remove duplicates and unused prototypes.
Signed-off-by Jan Kiszka <[email protected]>

Applied, thanks.

Signature · 2 lines

Jiri Kosina
SUSE Labs, Novell Inc.