Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nathanw_sa]: src/sys Sync with HEAD.
details: https://anonhg.NetBSD.org/src/rev/32f01c5c9036
branches: nathanw_sa
changeset: 506552:32f01c5c9036
user: thorpej <thorpej%NetBSD.org@localhost>
date: Wed Dec 11 06:50:04 2002 +0000
description:
Sync with HEAD.
diffstat:
sys/msdosfs/Makefile | 3 +-
sys/sys/Makefile | 13 +-
sys/sys/cdefs_aout.h | 4 +-
sys/sys/device.h | 10 +-
sys/sys/errno.h | 4 +-
sys/sys/exec_aout.h | 12 +-
sys/sys/exec_elf.h | 16 +-
sys/sys/exec_macho.h | 20 ++-
sys/sys/fcntl.h | 25 +--
sys/sys/ioctl_compat.h | 8 +-
sys/sys/localedef.h | 14 +-
sys/sys/mbuf.h | 10 +-
sys/sys/param.h | 33 +++++-
sys/sys/queue.h | 81 +++++++++++++-
sys/sys/select.h | 12 +-
sys/sys/siginfo.h | 166 ++++++++++++++++++++++++++++
sys/sys/signal.h | 36 ++---
sys/sys/signalvar.h | 145 ++++++++++++-----------
sys/sys/sysctl.h | 8 +-
sys/sys/systm.h | 5 +-
sys/sys/time.h | 3 +-
sys/sys/tprintf.h | 7 +-
sys/sys/tty.h | 8 +-
sys/sys/ttychars.h | 5 +-
sys/sys/ttydefaults.h | 6 +-
sys/ufs/Makefile | 3 +-
sys/ufs/ext2fs/ext2fs.h | 7 +-
sys/ufs/ext2fs/ext2fs_dinode.h | 7 +-
sys/ufs/ext2fs/ext2fs_dir.h | 8 +-
sys/ufs/ext2fs/ext2fs_extern.h | 6 +-
sys/ufs/ext2fs/ext2fs_lookup.c | 27 ++--
sys/ufs/ffs/ffs_extern.h | 7 +-
sys/ufs/ffs/ffs_softdep.c | 27 ++--
sys/ufs/ffs/ffs_subr.c | 8 +-
sys/ufs/ffs/ffs_vfsops.c | 12 +-
sys/ufs/ffs/softdep.h | 7 +-
sys/ufs/lfs/lfs.h | 9 +-
sys/ufs/lfs/lfs_alloc.c | 6 +-
sys/ufs/lfs/lfs_bio.c | 17 ++-
sys/ufs/lfs/lfs_extern.h | 7 +-
sys/ufs/lfs/lfs_syscalls.c | 51 +++++++-
sys/ufs/lfs/lfs_vfsops.c | 6 +-
sys/ufs/lfs/lfs_vnops.c | 6 +-
sys/ufs/mfs/mfs_extern.h | 7 +-
sys/ufs/mfs/mfsnode.h | 7 +-
sys/ufs/ufs/dir.h | 8 +-
sys/ufs/ufs/inode.h | 8 +-
sys/ufs/ufs/quota.h | 4 +-
sys/ufs/ufs/ufs_bswap.h | 7 +-
sys/ufs/ufs/ufs_extern.h | 7 +-
sys/ufs/ufs/ufs_lookup.c | 27 ++--
sys/ufs/ufs/ufsmount.h | 7 +-
sys/uvm/Makefile | 3 +-
sys/uvm/uvm.h | 9 +-
sys/uvm/uvm_amap.c | 243 +++++++++++++++++++++++++++++++---------
sys/uvm/uvm_amap.h | 11 +-
sys/uvm/uvm_amap_i.h | 11 +-
sys/uvm/uvm_aobj.c | 7 +-
sys/uvm/uvm_extern.h | 4 +-
sys/uvm/uvm_glue.c | 37 +++--
sys/uvm/uvm_km.c | 10 +-
sys/uvm/uvm_map.c | 136 +++++++++++++++-------
sys/uvm/uvm_map_i.h | 12 +-
sys/uvm/uvm_page_i.h | 12 +-
sys/uvm/uvm_pager_i.h | 12 +-
sys/uvm/uvm_pdaemon.c | 6 +-
66 files changed, 1039 insertions(+), 431 deletions(-)
diffs (truncated from 3260 to 300 lines):
diff -r a849376d0999 -r 32f01c5c9036 sys/msdosfs/Makefile
--- a/sys/msdosfs/Makefile Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/msdosfs/Makefile Wed Dec 11 06:50:04 2002 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.1 1998/06/12 23:23:06 cgd Exp $
+# $NetBSD: Makefile,v 1.1.26.1 2002/12/11 07:01:03 thorpej Exp $
-KDIR= /sys/msdosfs
INCSDIR= /usr/include/msdosfs
INCS= bootsect.h bpb.h denode.h direntry.h fat.h msdosfsmount.h
diff -r a849376d0999 -r 32f01c5c9036 sys/sys/Makefile
--- a/sys/sys/Makefile Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/sys/Makefile Wed Dec 11 06:50:04 2002 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.25.2.11 2002/11/11 22:16:18 nathanw Exp $
+# $NetBSD: Makefile,v 1.25.2.12 2002/12/11 06:50:04 thorpej Exp $
-KDIR= /sys/sys
INCSDIR= /usr/include/sys
INCS= acct.h agpio.h ansi.h ataio.h audioio.h \
@@ -19,11 +18,11 @@
pmc.h poll.h pool.h proc.h properties.h \
protosw.h ptrace.h queue.h ras.h reboot.h radioio.h resource.h \
resourcevar.h rnd.h sa.h scanio.h sched.h scsiio.h select.h sem.h sha1.h \
- shm.h signal.h signalvar.h socket.h socketvar.h sockio.h stat.h \
- syscall.h syscallargs.h sysctl.h stdint.h swap.h syslimits.h syslog.h \
- systm.h tablet.h termios.h time.h timeb.h timepps.h times.h timex.h \
- tprintf.h trace.h tty.h ttychars.h ttycom.h ttydefaults.h ttydev.h \
- types.h ucontext.h ucred.h uio.h un.h unistd.h unpcb.h user.h \
+ shm.h siginfo.h signal.h signalvar.h socket.h socketvar.h sockio.h \
+ stat.h syscall.h syscallargs.h sysctl.h stdint.h swap.h syslimits.h \
+ syslog.h systm.h tablet.h termios.h time.h timeb.h timepps.h times.h \
+ timex.h tprintf.h trace.h tty.h ttychars.h ttycom.h ttydefaults.h \
+ ttydev.h types.h ucontext.h ucred.h uio.h un.h unistd.h unpcb.h user.h \
utsname.h vadvise.h verified_exec.h vmmeter.h vnode.h vnode_if.h wait.h wdog.h
SYMLINKS= sys/exec_elf.h /usr/include/elf.h \
diff -r a849376d0999 -r 32f01c5c9036 sys/sys/cdefs_aout.h
--- a/sys/sys/cdefs_aout.h Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/sys/cdefs_aout.h Wed Dec 11 06:50:04 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs_aout.h,v 1.5.2.4 2002/11/01 23:04:39 thorpej Exp $ */
+/* $NetBSD: cdefs_aout.h,v 1.5.2.5 2002/12/11 06:50:04 thorpej Exp $ */
/*
* Written by J.T. Conklin <jtc%wimsey.com@localhost> 01/17/95.
@@ -68,7 +68,7 @@
#define __KERNEL_SCCSID(_n,_s)
#define __KERNEL_COPYRIGHT(_n, _s) __IDSTRING(__CONCAT(copyright,_n),_s)
-#ifdef __lint__
+#ifndef __lint__
#define __link_set_make_entry(set, sym, type) \
static void const * const __link_set_##set##_sym_##sym = &sym; \
__asm(".stabs \"___link_set_" #set "\", " #type ", 0, 0, _" #sym)
diff -r a849376d0999 -r 32f01c5c9036 sys/sys/device.h
--- a/sys/sys/device.h Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/sys/device.h Wed Dec 11 06:50:04 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.45.2.6 2002/11/11 22:16:21 nathanw Exp $ */
+/* $NetBSD: device.h,v 1.45.2.7 2002/12/11 06:50:04 thorpej Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -166,6 +166,13 @@
}
/*
+ * Attach a static event counter. This uses a link set to do the work.
+ * NOTE: "ev" should not be a pointer to the object, but rather a direct
+ * reference to the object itself.
+ */
+#define EVCNT_ATTACH_STATIC(ev) __link_set_add_data(evcnts, ev)
+
+/*
* Description of a configuration parent. Each device attachment attaches
* to an "interface attribute", which is given in this structure. The parent
* *must* carry this attribute. Optionally, an individual device instance
@@ -339,6 +346,7 @@
void device_register(struct device *, void *);
#endif
+void evcnt_init(void);
void evcnt_attach_static(struct evcnt *);
void evcnt_attach_dynamic(struct evcnt *, int, const struct evcnt *,
const char *, const char *);
diff -r a849376d0999 -r 32f01c5c9036 sys/sys/errno.h
--- a/sys/sys/errno.h Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/sys/errno.h Wed Dec 11 06:50:04 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: errno.h,v 1.26.2.2 2002/11/12 13:06:16 skrll Exp $ */
+/* $NetBSD: errno.h,v 1.26.2.3 2002/12/11 06:50:04 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -192,7 +192,7 @@
/* XSI STREAMS option errors */
#define ENODATA 89 /* No message available */
-#define ENOSR 90 /* No STREAM resource */
+#define ENOSR 90 /* No STREAM resources */
#define ENOSTR 91 /* Not a STREAM */
#define ELAST 91 /* Must equal largest errno */
diff -r a849376d0999 -r 32f01c5c9036 sys/sys/exec_aout.h
--- a/sys/sys/exec_aout.h Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/sys/exec_aout.h Wed Dec 11 06:50:04 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_aout.h,v 1.23.14.3 2002/08/01 02:46:57 nathanw Exp $ */
+/* $NetBSD: exec_aout.h,v 1.23.14.4 2002/12/11 06:50:04 thorpej Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -34,7 +34,7 @@
#define _SYS_EXEC_AOUT_H_
#ifndef N_PAGSIZ
-#define N_PAGSIZ(ex) (__LDPGSZ)
+#define N_PAGSIZ(ex) (AOUT_LDPGSZ)
#endif
/*
@@ -135,7 +135,7 @@
#define N_ALIGN(ex,x) \
(N_GETMAGIC(ex) == ZMAGIC || N_GETMAGIC(ex) == QMAGIC ? \
- ((x) + __LDPGSZ - 1) & ~(__LDPGSZ - 1) : (x))
+ ((x) + AOUT_LDPGSZ - 1) & ~(AOUT_LDPGSZ - 1) : (x))
/* Valid magic number check. */
#define N_BADMAG(ex) \
@@ -143,12 +143,12 @@
N_GETMAGIC(ex) != ZMAGIC && N_GETMAGIC(ex) != QMAGIC)
/* Address of the bottom of the text segment. */
-#define N_TXTADDR(ex) (N_GETMAGIC2(ex) == (ZMAGIC|0x10000) ? 0 : __LDPGSZ)
+#define N_TXTADDR(ex) (N_GETMAGIC2(ex) == (ZMAGIC|0x10000) ? 0 : AOUT_LDPGSZ)
/* Address of the bottom of the data segment. */
#define N_DATADDR(ex) \
(N_GETMAGIC(ex) == OMAGIC ? N_TXTADDR(ex) + (ex).a_text : \
- (N_TXTADDR(ex) + (ex).a_text + __LDPGSZ - 1) & ~(__LDPGSZ - 1))
+ (N_TXTADDR(ex) + (ex).a_text + AOUT_LDPGSZ - 1) & ~(AOUT_LDPGSZ - 1))
/* Address of the bottom of the bss segment. */
#define N_BSSADDR(ex) \
@@ -157,7 +157,7 @@
/* Text segment offset. */
#define N_TXTOFF(ex) \
( N_GETMAGIC2(ex)==ZMAGIC || N_GETMAGIC2(ex)==(QMAGIC|0x10000) ? \
- 0 : (N_GETMAGIC2(ex)==(ZMAGIC|0x10000) ? __LDPGSZ : \
+ 0 : (N_GETMAGIC2(ex)==(ZMAGIC|0x10000) ? AOUT_LDPGSZ : \
sizeof(struct exec)) )
/* Data segment offset. */
diff -r a849376d0999 -r 32f01c5c9036 sys/sys/exec_elf.h
--- a/sys/sys/exec_elf.h Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/sys/exec_elf.h Wed Dec 11 06:50:04 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.h,v 1.40.2.11 2002/10/18 02:45:41 nathanw Exp $ */
+/* $NetBSD: exec_elf.h,v 1.40.2.12 2002/12/11 06:50:05 thorpej Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -321,19 +321,21 @@
#define PT_PHDR 6 /* Entry for header table itself */
#define PT_NUM 7
+#define PT_LOOS 0x60000000 /* OS-specific range */
+#define PT_HIOS 0x6fffffff
+#define PT_LOPROC 0x70000000 /* Processor-specific range */
+#define PT_HIPROC 0x7fffffff
+
+#define PT_MIPS_REGINFO 0x70000000
+
/* p_flags */
#define PF_R 0x4 /* Segment is readable */
#define PF_W 0x2 /* Segment is writable */
#define PF_X 0x1 /* Segment is executable */
-#define PF_MASKOS 0x0ff00000 /* Opersting system specific values */
+#define PF_MASKOS 0x0ff00000 /* Operating system specific values */
#define PF_MASKPROC 0xf0000000 /* Processor-specific values */
-#define PT_LOPROC 0x70000000 /* Processor-specific range */
-#define PT_HIPROC 0x7fffffff
-
-#define PT_MIPS_REGINFO 0x70000000
-
/*
* Section Headers
*/
diff -r a849376d0999 -r 32f01c5c9036 sys/sys/exec_macho.h
--- a/sys/sys/exec_macho.h Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/sys/exec_macho.h Wed Dec 11 06:50:04 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_macho.h,v 1.2.4.4 2002/11/11 22:16:26 nathanw Exp $ */
+/* $NetBSD: exec_macho.h,v 1.2.4.5 2002/12/11 06:50:05 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,6 +39,8 @@
#ifndef _SYS_EXEC_MACHO_H_
#define _SYS_EXEC_MACHO_H_
+#include <sys/param.h>
+
#include <machine/int_types.h>
#include <machine/macho_machdep.h>
@@ -102,11 +104,11 @@
#define MACHO_CPU_SUBTYPE_486 4
#define MACHO_CPU_SUBTYPE_486SX (4 + 128)
#define MACHO_CPU_SUBTYPE_586 5
-#define MACHO_CPU_SUBTYPE_INTEL(f, m) (f) + ((m) << 4))
-#define MACHO_CPU_SUBTYPE_PENT CPU_SUBTYPE_INTEL(5, 0)
-#define MACHO_CPU_SUBTYPE_PENTPRO CPU_SUBTYPE_INTEL(6, 1)
-#define MACHO_CPU_SUBTYPE_PENTII_M3 CPU_SUBTYPE_INTEL(6, 3)
-#define MACHO_CPU_SUBTYPE_PENTII_M5 CPU_SUBTYPE_INTEL(6, 5)
+#define MACHO_CPU_SUBTYPE_INTEL(f, m) ((f) + ((m) << 4))
+#define MACHO_CPU_SUBTYPE_PENT MACHO_CPU_SUBTYPE_INTEL(5, 0)
+#define MACHO_CPU_SUBTYPE_PENTPRO MACHO_CPU_SUBTYPE_INTEL(6, 1)
+#define MACHO_CPU_SUBTYPE_PENTII_M3 MACHO_CPU_SUBTYPE_INTEL(6, 3)
+#define MACHO_CPU_SUBTYPE_PENTII_M5 MACHO_CPU_SUBTYPE_INTEL(6, 5)
#define MACHO_CPU_SUBTYPE_INTEL_FAMILY(x) ((x) & 15)
#define MACHO_CPU_SUBTYPE_INTEL_FAMILY_MAX 15
#define MACHO_CPU_SUBTYPE_INTEL_MODEL(x) ((x) >> 4)
@@ -240,6 +242,12 @@
u_long count;
};
+struct exec_macho_emul_arg {
+ char *path;
+ char filename[MAXPATHLEN];
+ struct exec_macho_object_header *macho_hdr;
+};
+
#ifndef _LKM
#include "opt_execfmt.h"
#endif
diff -r a849376d0999 -r 32f01c5c9036 sys/sys/fcntl.h
--- a/sys/sys/fcntl.h Wed Dec 11 06:38:55 2002 +0000
+++ b/sys/sys/fcntl.h Wed Dec 11 06:50:04 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fcntl.h,v 1.17.14.2 2002/01/08 00:34:42 nathanw Exp $ */
+/* $NetBSD: fcntl.h,v 1.17.14.3 2002/12/11 06:50:05 thorpej Exp $ */
/*-
* Copyright (c) 1983, 1990, 1993
@@ -93,11 +93,15 @@
(_POSIX_C_SOURCE - 0) >= 199309L || \
(defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \
(_XOPEN_SOURCE - 0) >= 500
-#define O_SYNC 0x00000080 /* synchronous writes */
+#define O_SYNC 0x00000080 /* synchronous writes */
#endif
-#define O_CREAT 0x00000200 /* create if nonexistent */
-#define O_TRUNC 0x00000400 /* truncate to zero length */
-#define O_EXCL 0x00000800 /* error if already exists */
+#if !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
+#define O_NOFOLLOW 0x00000100 /* don't follow symlinks on the last */
+ /* path component */
+#endif
+#define O_CREAT 0x00000200 /* create if nonexistent */
+#define O_TRUNC 0x00000400 /* truncate to zero length */
+#define O_EXCL 0x00000800 /* error if already exists */
#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
(_POSIX_C_SOURCE - 0) >= 199309L || (_XOPEN_SOURCE - 0) >= 500
@@ -110,7 +114,7 @@
#endif
/* defined by POSIX 1003.1; BSD default, but required to be bitwise distinct */
-#define O_NOCTTY 0x008000 /* don't assign controlling terminal */
+#define O_NOCTTY 0x00008000 /* don't assign controlling terminal */
#ifdef _KERNEL
/* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */
@@ -120,18 +124,11 @@
/* all bits settable during open(2) */
#define O_MASK (O_ACCMODE|O_NONBLOCK|O_APPEND|O_SHLOCK|O_EXLOCK|\
O_ASYNC|O_SYNC|O_CREAT|O_TRUNC|O_EXCL|O_DSYNC|\
- O_RSYNC|O_NOCTTY|O_ALT_IO)
+ O_RSYNC|O_NOCTTY|O_ALT_IO|O_NOFOLLOW)
#define FMARK 0x00001000 /* mark during gc() */
#define FDEFER 0x00002000 /* defer for next gc pass */
#define FHASLOCK 0x00004000 /* descriptor holds advisory lock */
-/*
- * Note: The below is not a flag that can be used in the struct file.
- * It's an option that can be passed to vn_open to make sure it doesn't
- * follow a symlink on the last lookup
- */
-#define FNOSYMLINK 0x00080000 /* Don't follow symlink for last
- component */
/* bits to save after open(2) */
#define FMASK (FREAD|FWRITE|FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FDSYNC|\
FRSYNC|FALTIO)
Home |
Main Index |
Thread Index |
Old Index