Page MenuHomeFreeBSD
Files F109918941

D44101.diff
No OneTemporary
Actions

D44101.diff
View Options

diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys
--- a/lib/libsys/Makefile.sys
+++ b/lib/libsys/Makefile.sys
@@ -16,8 +16,7 @@
# declarations in common:
#
NOASM= exit.o \
- getlogin.o \
- yield.o
+ getlogin.o
PSEUDO= _exit.o \
_getlogin.o
.include "${LIBSYS_SRCTOP}/${LIBC_ARCH}/Makefile.sys"
diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map
--- a/lib/libsys/syscalls.map
+++ b/lib/libsys/syscalls.map
@@ -352,8 +352,6 @@
__sys_aio_cancel;
_aio_error;
__sys_aio_error;
- _yield;
- __sys_yield;
_mlockall;
__sys_mlockall;
_munlockall;
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -263,7 +263,7 @@
/* 318 is freebsd6 freebsd32_aio_read */
/* 319 is freebsd6 freebsd32_aio_write */
/* 320 is freebsd6 freebsd32_lio_listio */
-#define FREEBSD32_SYS_yield 321
+ /* 321 is obsolete yield */
/* 322 is obsolete thr_sleep */
/* 323 is obsolete thr_wakeup */
#define FREEBSD32_SYS_mlockall 324
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -326,7 +326,7 @@
"compat6.freebsd32_aio_read", /* 318 = freebsd6 freebsd32_aio_read */
"compat6.freebsd32_aio_write", /* 319 = freebsd6 freebsd32_aio_write */
"compat6.freebsd32_lio_listio", /* 320 = freebsd6 freebsd32_lio_listio */
- "yield", /* 321 = yield */
+ "obs_yield", /* 321 = obsolete yield */
"obs_thr_sleep", /* 322 = obsolete thr_sleep */
"obs_thr_wakeup", /* 323 = obsolete thr_wakeup */
"mlockall", /* 324 = mlockall */
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -382,7 +382,7 @@
{ compat6(AS(freebsd6_freebsd32_aio_read_args),freebsd32_aio_read), .sy_auevent = AUE_AIO_READ, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 318 = freebsd6 freebsd32_aio_read */
{ compat6(AS(freebsd6_freebsd32_aio_write_args),freebsd32_aio_write), .sy_auevent = AUE_AIO_WRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 319 = freebsd6 freebsd32_aio_write */
{ compat6(AS(freebsd6_freebsd32_lio_listio_args),freebsd32_lio_listio), .sy_auevent = AUE_LIO_LISTIO, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 320 = freebsd6 freebsd32_lio_listio */
- { .sy_narg = 0, .sy_call = (sy_call_t *)sys_yield, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 321 = yield */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 321 = obsolete yield */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 322 = obsolete thr_sleep */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 323 = obsolete thr_wakeup */
{ .sy_narg = AS(mlockall_args), .sy_call = (sy_call_t *)sys_mlockall, .sy_auevent = AUE_MLOCKALL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 324 = mlockall */
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -1457,11 +1457,6 @@
*n_args = 1;
break;
}
- /* yield */
- case 321: {
- *n_args = 0;
- break;
- }
/* mlockall */
case 324: {
struct mlockall_args *p = params;
@@ -5682,9 +5677,6 @@
break;
};
break;
- /* yield */
- case 321:
- break;
/* mlockall */
case 324:
switch (ndx) {
@@ -9946,8 +9938,6 @@
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* yield */
- case 321:
/* mlockall */
case 324:
if (ndx == 0 || ndx == 1)
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -381,7 +381,7 @@
{ compat6(AS(freebsd6_aio_read_args),aio_read), .sy_auevent = AUE_AIO_READ, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 318 = freebsd6 aio_read */
{ compat6(AS(freebsd6_aio_write_args),aio_write), .sy_auevent = AUE_AIO_WRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 319 = freebsd6 aio_write */
{ compat6(AS(freebsd6_lio_listio_args),lio_listio), .sy_auevent = AUE_LIO_LISTIO, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 320 = freebsd6 lio_listio */
- { .sy_narg = 0, .sy_call = (sy_call_t *)sys_yield, .sy_auevent = AUE_NULL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 321 = yield */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 321 = obsolete yield */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 322 = obsolete thr_sleep */
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 323 = obsolete thr_wakeup */
{ .sy_narg = AS(mlockall_args), .sy_call = (sy_call_t *)sys_mlockall, .sy_auevent = AUE_MLOCKALL, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 324 = mlockall */
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -690,21 +690,6 @@
PICKUP_GIANT();
}
-/*
- * General purpose yield system call.
- */
-int
-sys_yield(struct thread *td, struct yield_args *uap)
-{
-
- thread_lock(td);
- if (PRI_BASE(td->td_pri_class) == PRI_TIMESHARE)
- sched_prio(td, PRI_MAX_TIMESHARE);
- mi_switch(SW_VOL | SWT_RELINQUISH);
- td->td_retval[0] = 0;
- return (0);
-}
-
int
sys_sched_getcpu(struct thread *td, struct sched_getcpu_args *uap)
{
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -326,7 +326,7 @@
"compat6.aio_read", /* 318 = freebsd6 aio_read */
"compat6.aio_write", /* 319 = freebsd6 aio_write */
"compat6.lio_listio", /* 320 = freebsd6 lio_listio */
- "yield", /* 321 = yield */
+ "obs_yield", /* 321 = obsolete yield */
"obs_thr_sleep", /* 322 = obsolete thr_sleep */
"obs_thr_wakeup", /* 323 = obsolete thr_wakeup */
"mlockall", /* 324 = mlockall */
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1679,9 +1679,7 @@
_In_opt_ _Contains_ptr_ struct osigevent *sig
);
}
-321 AUE_NULL STD|CAPENABLED {
- int yield(void);
- }
+321 AUE_NULL OBSOL yield
322 AUE_NULL OBSOL thr_sleep
323 AUE_NULL OBSOL thr_wakeup
324 AUE_MLOCKALL STD|CAPENABLED {
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -1478,11 +1478,6 @@
*n_args = 1;
break;
}
- /* yield */
- case 321: {
- *n_args = 0;
- break;
- }
/* mlockall */
case 324: {
struct mlockall_args *p = params;
@@ -5795,9 +5790,6 @@
break;
};
break;
- /* yield */
- case 321:
- break;
/* mlockall */
case 324:
switch (ndx) {
@@ -10111,8 +10103,6 @@
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* yield */
- case 321:
/* mlockall */
case 324:
if (ndx == 0 || ndx == 1)
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -267,7 +267,7 @@
/* 318 is freebsd6 aio_read */
/* 319 is freebsd6 aio_write */
/* 320 is freebsd6 lio_listio */
-#define SYS_yield 321
+ /* 321 is obsolete yield */
/* 322 is obsolete thr_sleep */
/* 323 is obsolete thr_wakeup */
#define SYS_mlockall 324
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -192,7 +192,6 @@
aio_suspend.o \
aio_cancel.o \
aio_error.o \
- yield.o \
mlockall.o \
munlockall.o \
__getcwd.o \
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -788,9 +788,6 @@
struct aio_error_args {
char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
};
-struct yield_args {
- syscallarg_t dummy;
-};
struct mlockall_args {
char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
};
@@ -2051,7 +2048,6 @@
int sys_aio_suspend(struct thread *, struct aio_suspend_args *);
int sys_aio_cancel(struct thread *, struct aio_cancel_args *);
int sys_aio_error(struct thread *, struct aio_error_args *);
-int sys_yield(struct thread *, struct yield_args *);
int sys_mlockall(struct thread *, struct mlockall_args *);
int sys_munlockall(struct thread *, struct munlockall_args *);
int sys___getcwd(struct thread *, struct __getcwd_args *);
@@ -3015,7 +3011,6 @@
#define SYS_AUE_freebsd6_aio_read AUE_AIO_READ
#define SYS_AUE_freebsd6_aio_write AUE_AIO_WRITE
#define SYS_AUE_freebsd6_lio_listio AUE_LIO_LISTIO
-#define SYS_AUE_yield AUE_NULL
#define SYS_AUE_mlockall AUE_MLOCKALL
#define SYS_AUE_munlockall AUE_MUNLOCKALL
#define SYS_AUE___getcwd AUE_GETCWD

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 12, 5:27 AM (16 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16606581
Default Alt Text
D44101.diff (9 KB)

Event Timeline