The branch main has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9151abe323034275014dcfffb4a793bc5032bf87
commit 9151abe323034275014dcfffb4a793bc5032bf87
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-09-13 20:37:26 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-09-21 17:20:15 +0000
exec_machdep.c: some style, use ANSI C definition for sys_sigreturn()
Reviewed by: jhb, markj
Tested by: pho
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Differential revision: https://reviews.freebsd.org/D31954
---
sys/amd64/amd64/exec_machdep.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/sys/amd64/amd64/exec_machdep.c b/sys/amd64/amd64/exec_machdep.c
index 5cd905e1051b..1297117638d6 100644
--- a/sys/amd64/amd64/exec_machdep.c
+++ b/sys/amd64/amd64/exec_machdep.c
@@ -97,7 +97,7 @@ __FBSDID("$FreeBSD$");
static void get_fpcontext(struct thread *td, mcontext_t *mcp,
char *xfpusave, size_t xfpusave_len);
-static int set_fpcontext(struct thread *td, mcontext_t *mcp,
+static int set_fpcontext(struct thread *td, mcontext_t *mcp,
char *xfpustate, size_t xfpustate_len);
/*
@@ -236,11 +236,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
* state to gain improper privileges.
*/
int
-sys_sigreturn(td, uap)
- struct thread *td;
- struct sigreturn_args /* {
- const struct __ucontext *sigcntxp;
- } */ *uap;
+sys_sigreturn(struct thread *td, struct sigreturn_args *uap)
{
ucontext_t uc;
struct pcb *pcb;
@@ -938,7 +934,7 @@ user_dbreg_trap(register_t dr6)
* None of the breakpoint bits are set meaning this
* trap was not caused by any of the debug registers
*/
- return 0;
+ return (0);
}
dr7 = rdr7();
@@ -948,7 +944,7 @@ user_dbreg_trap(register_t dr6)
* thus the trap couldn't have been caused by the
* hardware debug registers
*/
- return 0;
+ return (0);
}
nbp = 0;
@@ -976,12 +972,12 @@ user_dbreg_trap(register_t dr6)
/*
* addr[i] is in user space
*/
- return nbp;
+ return (nbp);
}
}
/*
* None of the breakpoints are in user space.
*/
- return 0;
+ return (0);
}
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
