Page MenuHomeFreeBSD
Files F153525799

D15638.id.diff
No OneTemporary
Actions

D15638.id.diff
View Options

Index: head/sys/compat/freebsd32/syscalls.master
===================================================================
--- head/sys/compat/freebsd32/syscalls.master
+++ head/sys/compat/freebsd32/syscalls.master
@@ -87,8 +87,7 @@
int mode, int dev); }
15 AUE_CHMOD NOPROTO { int chmod(char *path, int mode); }
16 AUE_CHOWN NOPROTO { int chown(char *path, int uid, int gid); }
-17 AUE_NULL NOPROTO { caddr_t obreak(char *nsize); } break \
- obreak_args int
+17 AUE_NULL NOPROTO { caddr_t break(char *nsize); }
18 AUE_GETFSSTAT COMPAT4 { int freebsd32_getfsstat( \
struct statfs32 *buf, long bufsize, \
int mode); }
Index: head/sys/compat/linux/linux_misc.c
===================================================================
--- head/sys/compat/linux/linux_misc.c
+++ head/sys/compat/linux/linux_misc.c
@@ -231,7 +231,7 @@
{
struct vmspace *vm = td->td_proc->p_vmspace;
vm_offset_t new, old;
- struct obreak_args /* {
+ struct break_args /* {
char * nsize;
} */ tmp;
@@ -242,7 +242,7 @@
old = (vm_offset_t)vm->vm_daddr + ctob(vm->vm_dsize);
new = (vm_offset_t)args->dsend;
tmp.nsize = (char *)new;
- if (((caddr_t)new > vm->vm_daddr) && !sys_obreak(td, &tmp))
+ if (((caddr_t)new > vm->vm_daddr) && !sys_break(td, &tmp))
td->td_retval[0] = (long)new;
else
td->td_retval[0] = (long)old;
Index: head/sys/i386/ibcs2/syscalls.master
===================================================================
--- head/sys/i386/ibcs2/syscalls.master
+++ head/sys/i386/ibcs2/syscalls.master
@@ -57,7 +57,7 @@
15 AUE_CHMOD STD { int ibcs2_chmod(char *path, int mode); }
16 AUE_CHOWN STD { int ibcs2_chown(char *path, int uid, \
int gid); }
-17 AUE_NULL NOPROTO { int obreak(caddr_t nsize); }
+17 AUE_NULL NOPROTO { caddr_t break(caddr_t nsize); }
18 AUE_STAT STD { int ibcs2_stat(char* path, \
struct ibcs2_stat *st); }
19 AUE_LSEEK STD { long ibcs2_lseek(int fd, long offset, \
Index: head/sys/kern/capabilities.conf
===================================================================
--- head/sys/kern/capabilities.conf
+++ head/sys/kern/capabilities.conf
@@ -438,7 +438,7 @@
##
## Allow simple VM operations on the current process.
##
-obreak
+break
##
## Allow AIO operations by file descriptor, subject to capability rights.
Index: head/sys/kern/syscalls.master
===================================================================
--- head/sys/kern/syscalls.master
+++ head/sys/kern/syscalls.master
@@ -118,8 +118,7 @@
15 AUE_CHMOD STD { int chmod(_In_z_ char *path, int mode); }
16 AUE_CHOWN STD { int chown(_In_z_ char *path, \
int uid, int gid); }
-17 AUE_NULL STD { caddr_t obreak(_In_ char *nsize); } break \
- obreak_args int
+17 AUE_NULL STD { caddr_t break(_In_ char *nsize); }
18 AUE_GETFSSTAT COMPAT4 { int getfsstat( \
_Out_writes_bytes_opt_(bufsize) \
struct ostatfs *buf, \
Index: head/sys/vm/vm_unix.c
===================================================================
--- head/sys/vm/vm_unix.c
+++ head/sys/vm/vm_unix.c
@@ -61,12 +61,12 @@
#include <vm/vm_map.h>
#ifndef _SYS_SYSPROTO_H_
-struct obreak_args {
+struct break_args {
char *nsize;
};
#endif
int
-sys_obreak(struct thread *td, struct obreak_args *uap)
+sys_break(struct thread *td, struct break_args *uap)
{
#if !defined(__aarch64__) && !defined(__riscv__)
struct vmspace *vm = td->td_proc->p_vmspace;
@@ -196,11 +196,8 @@
*
* XXX If the pages cannot be wired, no error is returned.
*/
- if ((map->flags & MAP_WIREFUTURE) == MAP_WIREFUTURE) {
- if (bootverbose)
- printf("obreak: MAP_WIREFUTURE set\n");
+ if ((map->flags & MAP_WIREFUTURE) == MAP_WIREFUTURE)
do_map_wirefuture = TRUE;
- }
} else if (new < old) {
rv = vm_map_delete(map, new, old);
if (rv != KERN_SUCCESS) {

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 3:50 PM (16 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31987860
Default Alt Text
D15638.id.diff (3 KB)

Event Timeline