Page MenuHomeFreeBSD
Files F102633682

D31259.diff
No OneTemporary
Actions

D31259.diff
View Options

diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c
--- a/sys/amd64/linux/linux_machdep.c
+++ b/sys/amd64/linux/linux_machdep.c
@@ -174,27 +174,6 @@
return (0);
}
-int
-linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap)
-{
- l_sigset_t lmask;
- sigset_t sigmask;
- int error;
-
- LINUX_CTR2(rt_sigsuspend, "%p, %ld",
- uap->newset, uap->sigsetsize);
-
- if (uap->sigsetsize != sizeof(l_sigset_t))
- return (EINVAL);
-
- error = copyin(uap->newset, &lmask, sizeof(l_sigset_t));
- if (error)
- return (error);
-
- linux_to_bsd_sigset(&lmask, &sigmask);
- return (kern_sigsuspend(td, sigmask));
-}
-
int
linux_pause(struct thread *td, struct linux_pause_args *args)
{
diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c
@@ -537,24 +537,6 @@
return (kern_sigsuspend(td, sigmask));
}
-int
-linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap)
-{
- l_sigset_t lmask;
- sigset_t sigmask;
- int error;
-
- if (uap->sigsetsize != sizeof(l_sigset_t))
- return (EINVAL);
-
- error = copyin(uap->newset, &lmask, sizeof(l_sigset_t));
- if (error)
- return (error);
-
- linux_to_bsd_sigset(&lmask, &sigmask);
- return (kern_sigsuspend(td, sigmask));
-}
-
int
linux_pause(struct thread *td, struct linux_pause_args *args)
{
diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c
--- a/sys/arm64/linux/linux_machdep.c
+++ b/sys/arm64/linux/linux_machdep.c
@@ -55,7 +55,6 @@
/* DTrace probes */
LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo);
-LIN_SDT_PROBE_DEFINE0(machdep, linux_rt_sigsuspend, todo);
LIN_SDT_PROBE_DEFINE0(machdep, linux_sigaltstack, todo);
/*
@@ -124,15 +123,6 @@
return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav));
}
-/* LINUXTODO: implement arm64 linux_rt_sigsuspend */
-int
-linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap)
-{
-
- LIN_SDT_PROBE0(machdep, linux_rt_sigsuspend, todo);
- return (EDOOFUS);
-}
-
/* LINUXTODO: implement arm64 linux_sigaltstack */
int
linux_sigaltstack(struct thread *td, struct linux_sigaltstack_args *uap)
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -791,3 +791,21 @@
return (linux_do_tkill(td, tds, &ksi));
}
+
+int
+linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap)
+{
+ l_sigset_t lmask;
+ sigset_t sigmask;
+ int error;
+
+ if (uap->sigsetsize != sizeof(l_sigset_t))
+ return (EINVAL);
+
+ error = copyin(uap->newset, &lmask, sizeof(l_sigset_t));
+ if (error != 0)
+ return (error);
+
+ linux_to_bsd_sigset(&lmask, &sigmask);
+ return (kern_sigsuspend(td, sigmask));
+}
diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c
--- a/sys/i386/linux/linux_machdep.c
+++ b/sys/i386/linux/linux_machdep.c
@@ -505,24 +505,6 @@
return (kern_sigsuspend(td, sigmask));
}
-int
-linux_rt_sigsuspend(struct thread *td, struct linux_rt_sigsuspend_args *uap)
-{
- l_sigset_t lmask;
- sigset_t sigmask;
- int error;
-
- if (uap->sigsetsize != sizeof(l_sigset_t))
- return (EINVAL);
-
- error = copyin(uap->newset, &lmask, sizeof(l_sigset_t));
- if (error)
- return (error);
-
- linux_to_bsd_sigset(&lmask, &sigmask);
- return (kern_sigsuspend(td, sigmask));
-}
-
int
linux_pause(struct thread *td, struct linux_pause_args *args)
{

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 2:51 AM (21 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14652038
Default Alt Text
D31259.diff (3 KB)

Event Timeline