michaelh/zephyr
1
0
Fork 0
Code Releases Activity

userspace: minor typo fixes in various places

Browse source 
System call arguments are indexed from 1 to 6, so arg0
is corrected to arg1 in two occasions. In addition, the
ARM function for system calls is now called z_arm_do_syscall,
so we update the inline comment in __svc handler.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2019-06-28 11:49:19 +02:00 • committed by Anas Nashif
commit 5d423b8078
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/core/swap_helper.S
View file

@ -426,7 +426,7 @@ _oops:
#if defined(CONFIG_USERSPACE) #if defined(CONFIG_USERSPACE)
/* /*
* System call will setup a jump to the _do_arm_syscall function * System call will setup a jump to the z_arm_do_syscall() function
* when the SVC returns via the bx lr. * when the SVC returns via the bx lr.
* *
* There is some trickery involved here because we have to preserve * There is some trickery involved here because we have to preserve
@ -456,7 +456,7 @@ _do_syscall:
cmp r6, ip cmp r6, ip
blt valid_syscall_id blt valid_syscall_id
/* bad syscall id. Set arg0 to bad id and set call_id to SYSCALL_BAD */ /* bad syscall id. Set arg1 to bad id and set call_id to SYSCALL_BAD */
str r6, [r0, #0] str r6, [r0, #0]
ldr r6, =K_SYSCALL_BAD ldr r6, =K_SYSCALL_BAD

2
kernel/include/syscall_handler.h
View file

@ -519,7 +519,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
* the bolierplate. The macros ensure that the seventh argument is named * the bolierplate. The macros ensure that the seventh argument is named
* "ssf" as this is now referenced by various other Z_SYSCALL macros. * "ssf" as this is now referenced by various other Z_SYSCALL macros.
* *
* Use the Z_SYSCALL_HANDLER(name_, arg0, ..., arg6) variant, as it will * Use the Z_SYSCALL_HANDLER(name_, arg1, ..., arg6) variant, as it will
* automatically deduce the correct version of Z__SYSCALL_HANDLERn() to * automatically deduce the correct version of Z__SYSCALL_HANDLERn() to
* use depending on the number of arguments. * use depending on the number of arguments.
*/ */