AVR32 build fixes
Subsystems (2)
This fixes two small bugs in the current git tree.
PATCH 1/2 AVR32: Fix sys_execve breakage
commit d7627467b7a8dd6944885290a03a07ceb28c10eb change sys_execve() arch/avr32, but the version in syscalls.h is still the old one.
--- arch/avr32/include/asm/syscalls.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/avr32/include/asm/syscalls.h +5 -0
@@ -24,6 +24,11 @@ asmlinkage int sys_vfork(struct pt_regs *); asmlinkage int sys_execve(const char __user *, char __user *__user *,char __user *__user *,struct pt_regs *); +asmlinkage int sys_execve(const char __user *ufilename, +const char __user *const __user *uargv, +const char __user *const __user *uenvp, +struct pt_regs *regs); +/* kernel/signal.c */ asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *,struct pt_regs *);
Signature · 1 line
1.7.2.3
Re: [PATCH 1/2] AVR32: Fix sys_execve breakage
Quoted 13 lines · Sven Schnelle
commit
d7627467b7a8dd6944885290a03a07ceb28c10ebchangesys_execve()arch/avr32, but the version insyscalls.his still the old one.Signed-off-by Sven Schnelle <[email protected]>--- arch/avr32/include/asm/syscalls.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)arch/avr32/include/asm/syscalls.h +0
-0
arch/avr32/include/asm/syscalls.h asmlinkage int sys_vfork(struct pt_regs *); · line 27
Quoted 4 lines
arch/avr32/include/asm/syscalls.h +1
-0@@ -24,6 +24,11 @@ asmlinkage int sys_vfork(struct pt_regs *); asmlinkage int sys_execve(const char __user *, char __user *__user *,char __user *__user *,struct pt_regs *); +asmlinkage int sys_execve(const char __user *ufilename,
Invalid patch, double definition of sys_execve.
<snipp>
Signature · 1 line
Hans-Christian Egtvedt
PATCH v2 1/1 AVR32: fix sys_execve build breakage
Quoted 16 lines
Quoted 16 lines
commit
d7627467b7a8dd6944885290a03a07ceb28c10ebchangesys_execve()arch/avr32, but the version insyscalls.his still the old one.Signed-off-by Sven Schnelle <[email protected]>--- arch/avr32/include/asm/syscalls.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)arch/avr32/include/asm/syscalls.h +0
-0@@ -24,6 +24,11 @@ asmlinkage int sys_vfork(struct pt_regs *); asmlinkage int sys_execve(const char __user *, char __user *__user *,char __user *__user *,struct pt_regs *);
Quoted 3 lines
arch/avr32/include/asm/syscalls.h asmlinkage int sys_vfork(struct pt_regs *); · line 27
Quoted 1 line
arch/avr32/include/asm/syscalls.h +1
-0+asmlinkage int sys_execve(const char __user *ufilename,Invalid patch, double definition of
sys_execve.
This should be the right one. Stupid me.
PATCH 1/1 AVR32: Fix sys_execve breakage
In reply to Hans-Christian EgtvedtFrom: Sven Schnelle <[email protected]>
--- arch/avr32/include/asm/syscalls.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/avr32/include/asm/syscalls.h +4 -2
@@ -21,8 +21,10 @@ asmlinkage int sys_clone(unsigned long, unsigned long, unsigned long, unsigned long, struct pt_regs *); asmlinkage int sys_vfork(struct pt_regs *); -asmlinkage int sys_execve(const char __user *, char __user *__user *, -char __user *__user *,struct pt_regs *); +asmlinkage int sys_execve(const char __user *ufilename, +const char __user *const __user *uargv, +const char __user *const __user *uenvp, +struct pt_regs *regs);/* kernel/signal.c */ asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *,
Signature · 1 line
1.7.2.3
Re: [PATCH] AVR32: Fix sys_execve breakage
Quoted 14 lines · On Thu, 2010-12-09 at 09:26 +0100, [email protected] wrote:
From: Sven Schnelle <[email protected]>
Signed-off-by Sven Schnelle <[email protected]>--- arch/avr32/include/asm/syscalls.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)arch/avr32/include/asm/syscalls.h +0
-0@@ -21,8 +21,10 @@ asmlinkage int sys_clone(unsigned long, unsigned long, unsigned long, unsigned long, struct pt_regs *);
arch/avr32/include/asm/syscalls.h asmlinkage int sys_clone(unsigned long, unsigned long, · line 30
Quoted 10 lines
arch/avr32/include/asm/syscalls.h +4
-2asmlinkage int sys_vfork(struct pt_regs *); -asmlinkage int sys_execve(const char __user *, char __user *__user *, -char __user *__user *,struct pt_regs *); +asmlinkage int sys_execve(const char __user *ufilename, +const char __user *const __user *uargv, +const char __user *const __user *uenvp, +struct pt_regs *regs);/* kernel/signal.c */ asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *,
Also discussed at https://lkml.org/lkml/2010/12/8/401 Sorry for not letting you know in my first reply.
I am thinking something in the order of
Quoted 1 line
From
8e2bf82870c3324d7151493d5557244fb178dbceMon Sep 17 00:00:00 2001
From: Hans-Christian Egtvedt <[email protected]>
Date: Thu, 9 Dec 2010 09:00:01 +0100
Subject: [PATCH] avr32: use syscall prototypes from asm-generic instead of arch
This patch removes the redundant syscalls prototypes in the architecture specific syscalls.h header file. These were identical with the ones in asm-generic/syscalls.h.
--- arch/avr32/include/asm/syscalls.h | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-)
arch/avr32/include/asm/syscalls.h +0 -11
@@ -16,20 +16,9 @@#include <linux/signal.h> /* kernel/process.c */ -asmlinkage int sys_fork(struct pt_regs *); asmlinkage int sys_clone(unsigned long, unsigned long,unsigned long ,unsigned long ,struct pt_regs *); -asmlinkage int sys_vfork(struct pt_regs *); -asmlinkage int sys_execve(const char __user *ufilename, -const char __user *const __user *uargv, -const char __user *const __user *uenvp, -struct pt_regs *regs); - -/* kernel/signal.c */ -asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *, -struct pt_regs *); -asmlinkage int sys_rt_sigreturn(struct pt_regs *);/* mm/cache.c */ asmlinkage int sys_cacheflush(int, void __user *, size_t);
Signature · 4 lines
1.7.1 -- Hans-Christian Egtvedt
PATCH 1/1 AVR32: Fix sys_execve breakage
In reply to Hans-Christian EgtvedtFrom: Sven Schnelle <[email protected]>
--- arch/avr32/include/asm/syscalls.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/avr32/include/asm/syscalls.h +4 -2
@@ -21,8 +21,10 @@ asmlinkage int sys_clone(unsigned long, unsigned long, unsigned long, unsigned long, struct pt_regs *); asmlinkage int sys_vfork(struct pt_regs *); -asmlinkage int sys_execve(const char __user *, char __user *__user *, -char __user *__user *,struct pt_regs *); +asmlinkage int sys_execve(const char __user *ufilename, +const char __user *const __user *uargv, +const char __user *const __user *uenvp, +struct pt_regs *regs);/* kernel/signal.c */ asmlinkage int sys_sigaltstack(const stack_t __user *, stack_t __user *,
Signature · 1 line
1.7.2.3
PATCH 2/2 Fix typo in atmel_usba_udc.c
In reply to Sven SchnelleIt should be 'udc' not 'ubc' in usba_udc_probe()
--- drivers/usb/gadget/atmel_usba_udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/usb/gadget/atmel_usba_udc.c +1 -1
@@ -2017,7 +2017,7 @@ static int __init usba_udc_probe(struct platform_device *pdev) } }else {/* gpio_request fail so use -EINVAL for gpio_is_valid */ - ubc->vbus_pin = -EINVAL ; + udc->vbus_pin = -EINVAL ; } }
Signature · 1 line
1.7.2.3
Re: [PATCH 2/2] [AVR32] Fix typo in atmel_usba_udc.c
Quoted 12 lines · Sven Schnelle
It should be 'udc' not 'ubc' in
usba_udc_probe()Signed-off-by Sven Schnelle <[email protected]>--- drivers/usb/gadget/atmel_usba_udc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/usb/gadget/atmel_usba_udc.c +0
-0
drivers/usb/gadget/atmel_usba_udc.c static int __init usba_udc_probe(struct platform_device *pdev) · line 2020
Quoted 5 lines
drivers/usb/gadget/atmel_usba_udc.c +1
-1@@ -2017,7 +2017,7 @@ static int __init usba_udc_probe(struct platform_device *pdev) } }else {/* gpio_request fail so use -EINVAL for gpio_is_valid */ - ubc->vbus_pin = -EINVAL ; + udc->vbus_pin = -EINVAL ;
Nice catch, please send this through the USB mailing list, it is not specific to AVR32.
Signature · 1 line
Hans-Christian Egtvedt