PERFORCE change 44192 for review
John Baldwin
jhb at FreeBSD.org
Mon Dec 22 08:40:29 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=44192
Change 44192 by jhb at jhb_blue on 2003/12/22 08:39:24
IFC @44189.
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#4 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mptable.c#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#19 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_sigtramp.S#3 branch
.. //depot/projects/smpng/sys/amd64/include/apicreg.h#2 integrate
.. //depot/projects/smpng/sys/amd64/include/param.h#7 integrate
.. //depot/projects/smpng/sys/boot/efi/include/efiapi.h#6 integrate
.. //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#5 integrate
.. //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/smpng/sys/boot/ofw/common/main.c#4 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#7 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#6 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#6 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#4 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#8 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_sigtramp.S#2 delete
.. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#6 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_util.h#3 integrate
.. //depot/projects/smpng/sys/compat/ndis/cfg_var.h#1 branch
.. //depot/projects/smpng/sys/compat/ndis/hal_var.h#1 branch
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#1 branch
.. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#1 branch
.. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#1 branch
.. //depot/projects/smpng/sys/compat/ndis/pe_var.h#1 branch
.. //depot/projects/smpng/sys/compat/ndis/resource_var.h#1 branch
.. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#1 branch
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#1 branch
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#1 branch
.. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#1 branch
.. //depot/projects/smpng/sys/conf/files#98 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#11 integrate
.. //depot/projects/smpng/sys/conf/files.i386#50 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#36 integrate
.. //depot/projects/smpng/sys/conf/majors#32 integrate
.. //depot/projects/smpng/sys/conf/options.i386#37 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#54 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#19 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#11 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#19 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#10 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#16 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#10 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#17 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#14 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#11 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#11 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#13 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#11 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#15 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#17 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#10 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.reg#9 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#9 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.c#6 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_inline.h#8 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#13 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#12 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#15 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.c#1 branch
.. //depot/projects/smpng/sys/dev/aic7xxx/aic_osm_lib.h#1 branch
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#6 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#4 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#8 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#25 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#6 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#16 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#4 integrate
.. //depot/projects/smpng/sys/dev/bktr/ioctl_bt848.h#2 integrate
.. //depot/projects/smpng/sys/dev/bktr/ioctl_meteor.h#2 integrate
.. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#3 integrate
.. //depot/projects/smpng/sys/dev/ciss/ciss.c#25 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#21 integrate
.. //depot/projects/smpng/sys/dev/firewire/sbp.h#3 integrate
.. //depot/projects/smpng/sys/dev/firewire/sbp_targ.c#3 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#1 branch
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#1 branch
.. //depot/projects/smpng/sys/dev/led/led.c#4 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#43 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#8 integrate
.. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#38 integrate
.. //depot/projects/smpng/sys/dev/stg/tmc18c30.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#29 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci.c#28 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/usb/ohcivar.h#9 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#31 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#41 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs.h#41 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#41 integrate
.. //depot/projects/smpng/sys/dev/usb/uscanner.c#16 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinum.c#15 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#17 integrate
.. //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#10 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#16 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#22 integrate
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#5 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#62 integrate
.. //depot/projects/smpng/sys/i386/i386/mptable.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#53 integrate
.. //depot/projects/smpng/sys/i386/include/apicreg.h#2 integrate
.. //depot/projects/smpng/sys/i386/include/cpu.h#9 integrate
.. //depot/projects/smpng/sys/i386/include/smp.h#12 integrate
.. //depot/projects/smpng/sys/ia64/ia32/Makefile#2 delete
.. //depot/projects/smpng/sys/ia64/ia32/ia32.h#2 delete
.. //depot/projects/smpng/sys/ia64/ia32/ia32_misc.c#6 delete
.. //depot/projects/smpng/sys/ia64/ia32/ia32_proto.h#10 delete
.. //depot/projects/smpng/sys/ia64/ia32/ia32_signal.c#1 branch
.. //depot/projects/smpng/sys/ia64/ia32/ia32_sigtramp.c#1 branch
.. //depot/projects/smpng/sys/ia64/ia32/ia32_syscall.h#10 delete
.. //depot/projects/smpng/sys/ia64/ia32/ia32_sysent.c#10 delete
.. //depot/projects/smpng/sys/ia64/ia32/ia32_sysvec.c#6 delete
.. //depot/projects/smpng/sys/ia64/ia32/ia32_util.h#4 delete
.. //depot/projects/smpng/sys/ia64/ia32/syscalls.conf#2 delete
.. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#13 delete
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#76 integrate
.. //depot/projects/smpng/sys/ia64/include/cpufunc.h#18 integrate
.. //depot/projects/smpng/sys/ia64/include/runq.h#3 integrate
.. //depot/projects/smpng/sys/isa/psm.c#20 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#38 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#34 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#23 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#38 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#37 integrate
.. //depot/projects/smpng/sys/kern/sysv_sem.c#25 integrate
.. //depot/projects/smpng/sys/kern/uipc_mbuf.c#22 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#56 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#64 integrate
.. //depot/projects/smpng/sys/modules/Makefile#67 integrate
.. //depot/projects/smpng/sys/modules/crypto/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/if_ndis/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/ndis/Makefile#1 branch
.. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni.c#2 integrate
.. //depot/projects/smpng/sys/netgraph/ng_bridge.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.h#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_etf.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ether.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ether.h#2 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#19 integrate
.. //depot/projects/smpng/sys/netgraph/ng_parse.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/ng_parse.h#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#15 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#27 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#29 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#40 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#15 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#26 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#8 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#2 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#17 integrate
.. //depot/projects/smpng/sys/opencrypto/crmbuf.c#3 delete
.. //depot/projects/smpng/sys/opencrypto/cryptodev.h#6 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#5 integrate
.. //depot/projects/smpng/sys/pci/if_sis.c#36 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#34 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#7 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#23 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#18 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#22 integrate
.. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#4 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#18 integrate
.. //depot/projects/smpng/sys/sys/_null.h#2 integrate
.. //depot/projects/smpng/sys/sys/ioctl_bt848.h#2 delete
.. //depot/projects/smpng/sys/sys/ioctl_meteor.h#2 delete
.. //depot/projects/smpng/sys/sys/mac.h#23 integrate
.. //depot/projects/smpng/sys/sys/mac_policy.h#19 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#30 integrate
.. //depot/projects/smpng/sys/sys/param.h#53 integrate
.. //depot/projects/smpng/sys/sys/proc.h#107 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#38 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#38 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#40 integrate
.. //depot/projects/smpng/sys/vm/uma_int.h#18 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#38 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#44 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.230 2003/12/03 14:57:25 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.231 2003/12/11 02:47:35 peter Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -163,9 +163,9 @@
cpu_add(u_int apic_id, char boot_cpu)
{
- if (apic_id > MAXCPU) {
+ if (apic_id >= MAXCPU) {
printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n",
- apic_id, MAXCPU);
+ apic_id, MAXCPU - 1);
return;
}
KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice",
==== //depot/projects/smpng/sys/amd64/amd64/mptable.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.228 2003/11/17 08:58:13 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable.c,v 1.229 2003/12/11 02:47:35 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@
/* string defined by the Intel MP Spec as identifying the MP table */
#define MP_SIG 0x5f504d5f /* _MP_ */
-#define NAPICID 32 /* Max number of I/O APIC's */
+#define NAPICID 32 /* Max number of APIC's */
#define BIOS_BASE (0xf0000)
#define BIOS_SIZE (0x10000)
@@ -811,7 +811,7 @@
* physical processor. If any of those ID's are
* already in the table, then kill the fixup.
*/
- for (id = 0; id <= MAXCPU; id++) {
+ for (id = 0; id < NAPICID; id++) {
if ((id_mask & 1 << id) == 0)
continue;
/* First, make sure we are on a logical_cpus boundary. */
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#19 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.448 2003/12/06 23:18:42 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.449 2003/12/22 01:01:31 alc Exp $");
/*
* Manages physical address maps.
@@ -227,7 +227,6 @@
static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex);
static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t);
static vm_offset_t pmap_kmem_choose(vm_offset_t addr);
-static void *pmap_pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait);
CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t));
CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t));
@@ -526,13 +525,6 @@
invltlb();
}
-static void *
-pmap_pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
-{
- *flags = UMA_SLAB_PRIV;
- return (void *)kmem_alloc(kernel_map, bytes);
-}
-
/*
* Initialize the pmap module.
* Called by vm_init, to initialize any structures that the pmap
@@ -545,7 +537,6 @@
vm_paddr_t phys_start, phys_end;
{
int i;
- int initial_pvs;
/*
* Allocate memory for random pmap data structures. Includes the
@@ -563,13 +554,9 @@
/*
* init the pv free list
*/
- initial_pvs = vm_page_array_size;
- if (initial_pvs < MINPV)
- initial_pvs = MINPV;
pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL,
NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
- uma_zone_set_allocf(pvzone, pmap_pv_allocf);
- uma_prealloc(pvzone, initial_pvs);
+ uma_prealloc(pvzone, MINPV);
/*
* Now it is safe to enable pv_table recording.
==== //depot/projects/smpng/sys/amd64/include/apicreg.h#2 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.25 2003/11/03 21:53:38 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.26 2003/12/11 02:48:25 peter Exp $
*/
#ifndef _MACHINE_APICREG_H_
@@ -342,38 +342,6 @@
#define APIC_TDCR_128 0x0a
#define APIC_TDCR_1 0x0b
-
-/*
- * fields in IRR
- * ISA INTerrupts are in bits 16-31 of the 1st IRR register.
- * these masks DON'T EQUAL the isa IRQs of the same name.
- */
-#define APIC_IRQ0 0x00000001
-#define APIC_IRQ1 0x00000002
-#define APIC_IRQ2 0x00000004
-#define APIC_IRQ3 0x00000008
-#define APIC_IRQ4 0x00000010
-#define APIC_IRQ5 0x00000020
-#define APIC_IRQ6 0x00000040
-#define APIC_IRQ7 0x00000080
-#define APIC_IRQ8 0x00000100
-#define APIC_IRQ9 0x00000200
-#define APIC_IRQ10 0x00000400
-#define APIC_IRQ11 0x00000800
-#define APIC_IRQ12 0x00001000
-#define APIC_IRQ13 0x00002000
-#define APIC_IRQ14 0x00004000
-#define APIC_IRQ15 0x00008000
-#define APIC_IRQ16 0x00010000
-#define APIC_IRQ17 0x00020000
-#define APIC_IRQ18 0x00040000
-#define APIC_IRQ19 0x00080000
-#define APIC_IRQ20 0x00100000
-#define APIC_IRQ21 0x00200000
-#define APIC_IRQ22 0x00400000
-#define APIC_IRQ23 0x00800000
-
-
/******************************************************************************
* I/O APIC defines
*/
==== //depot/projects/smpng/sys/amd64/include/param.h#7 (text+ko) ====
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)param.h 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/amd64/include/param.h,v 1.9 2003/11/17 08:58:14 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.10 2003/12/20 20:03:10 alc Exp $
*/
/*
@@ -142,7 +142,7 @@
* the kern.maxbcache /boot/loader.conf variable.
*/
#ifndef VM_BCACHE_SIZE_MAX
-#define VM_BCACHE_SIZE_MAX (200 * 1024 * 1024)
+#define VM_BCACHE_SIZE_MAX (400 * 1024 * 1024)
#endif
/*
==== //depot/projects/smpng/sys/boot/efi/include/efiapi.h#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.5 2002/12/08 20:47:44 marcel Exp $ */
+/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.6 2003/12/10 19:08:09 jhb Exp $ */
#ifndef _EFI_API_H
#define _EFI_API_H
@@ -204,7 +204,7 @@
/*
- * EFI platform varibles
+ * EFI platform variables
*/
#define EFI_GLOBAL_VARIABLE \
==== //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#5 (text+ko) ====
@@ -13,7 +13,7 @@
# purpose.
#
-# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.28 2003/12/09 05:40:06 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/boot0.s,v 1.29 2003/12/11 20:40:12 jhb Exp $
# A 512-byte boot manager.
@@ -176,7 +176,7 @@
callw putx # item
#
# Now that we've printed the drive (if we needed to), display a prompt.
-# Get ready for the input byte noting the time.
+# Get ready for the input by noting the time.
#
main.7: movw $prompt,%si # Display
callw putstr # prompt
==== //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#2 (text+ko) ====
@@ -13,7 +13,7 @@
# purpose.
#
-# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.9 2001/11/07 01:20:33 jhb Exp $
+# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.10 2003/12/11 22:42:50 jhb Exp $
#
# This program is a freestanding boot program to load an a.out binary
@@ -139,10 +139,26 @@
jmp error # Halt
have_vd: # Have Primary VD
#
-# Lookup the loader binary.
+# Try to look up the loader binary using the paths in the loader_paths
+# array.
#
- mov $loader_path,%si # File to lookup
- call lookup # Try to find it
+ mov $loader_paths,%si # Point to start of array
+lookup_path: push %si # Save file name pointer
+ call lookup # Try to find file
+ pop %di # Restore file name pointer
+ jnc lookup_found # Found this file
+ xor %al,%al # Look for next
+ mov $0xffff,%cx # path name by
+ repnz # scanning for
+ scasb # nul char
+ inc %di # Skip nul
+ mov %di,%si # Point %si at next path
+ mov (%si),%al # Get first char of next path
+ or %al,%al # Is it double nul?
+ jnz lookup_path # No, try it.
+ mov $msg_failed,%si # Failed message
+ jmp error # Halt
+lookup_found: # Found a loader file
#
# Load the binary into the buffer. Due to real mode addressing limitations
# we have to read it in in 64k chunks.
@@ -266,7 +282,8 @@
# Lookup the file in the path at [SI] from the root directory.
#
# Trashes: All but BX
-# Returns: BX = pointer to record
+# Returns: CF = 0 (success), BX = pointer to record
+# CF = 1 (not found)
#
lookup: mov $VD_ROOTDIR+MEM_VOLDESC,%bx # Root directory record
push %si
@@ -286,17 +303,21 @@
dec %si # Undo lodsb side effect
call find_file # Lookup first path item
jnc lookup_dir # Try next component
- mov $msg_lookupfail,%si # Not found.
+ mov $msg_lookupfail,%si # Not found message
+ call putstr
+ stc # Set carry
+ ret
jmp error
lookup_done: mov $msg_lookupok,%si # Success message
call putstr
+ clc # Clear carry
ret
#
# Lookup file at [SI] in directory whose record is at [BX].
#
# Trashes: All but returns
-# Returns: CF = 0 (success), BX = pointer to record, SX = next path item
+# Returns: CF = 0 (success), BX = pointer to record, SI = next path item
# CF = 1 (not found), SI = preserved
#
find_file: mov DIR_EXTENT(%bx),%eax # Load extent
@@ -536,7 +557,7 @@
twiddle_index: .byte 0x0
-msg_welcome: .asciz "CD Loader 1.01\r\n\n"
+msg_welcome: .asciz "CD Loader 1.2\r\n\n"
msg_bootinfo: .asciz "Building the boot loader arguments\r\n"
msg_relocate: .asciz "Relocating the loader and the BTX\r\n"
msg_jump: .asciz "Starting the BTX loader\r\n"
@@ -548,6 +569,9 @@
msg_lookupok: .asciz "Found\r\n"
msg_lookupfail: .asciz "File not found\r\n"
msg_load2big: .asciz "File too big\r\n"
-loader_path: .asciz "/BOOT/LOADER"
+msg_failed: .asciz "Boot failed\r\n"
twiddle_chars: .ascii "|/-\\"
+loader_paths: .asciz "/BOOT/LOADER"
+ .asciz "/boot/loader"
+ .byte 0
==== //depot/projects/smpng/sys/boot/ofw/common/main.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ofw/common/main.c,v 1.3 2002/11/10 19:17:35 jake Exp $
+ * $FreeBSD: src/sys/boot/ofw/common/main.c,v 1.4 2003/12/21 12:11:31 grehan Exp $
*/
#include <stand.h>
@@ -42,7 +42,9 @@
phandle_t chosen;
-#define HEAP_SIZE 0x40000
+static char bootargs[128];
+
+#define HEAP_SIZE 0x80000
void
init_heap(void)
@@ -54,7 +56,7 @@
OF_enter();
}
- setheap(base, base + (HEAP_SIZE / sizeof(base)));
+ setheap(base, (void *)((int)base + HEAP_SIZE));
}
uint32_t
@@ -62,14 +64,21 @@
{
ihandle_t meminstance;
phandle_t memory;
- struct ofw_reg reg;
+ struct ofw_reg reg[4];
+ int i;
+ int sz, memsz;
OF_getprop(chosen, "memory", &meminstance, sizeof(meminstance));
memory = OF_instance_to_package(meminstance);
- OF_getprop(memory, "reg", ®, sizeof(reg));
+ sz = OF_getprop(memory, "reg", ®, sizeof(reg));
+
+ sz /= sizeof(struct ofw_reg);
- return (reg.size);
+ for (i = 0, memsz = 0; i < sz; i++)
+ memsz += reg[i].size;
+
+ return (memsz);
}
int
@@ -78,6 +87,8 @@
int i;
char bootpath[64];
char *ch;
+ int bargc;
+ char **bargv;
/*
* Initalise the OpenFirmware routines by giving them the entry point.
@@ -122,8 +133,19 @@
printf("\n");
- env_setenv("currdev", EV_VOLATILE, bootpath,
- ofw_setcurrdev, env_nounset);
+ /*
+ * Only parse the first bootarg if present. It should
+ * be simple to handle extra arguments
+ */
+ OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs));
+ bargc = 0;
+ parse(&bargc, &bargv, bootargs);
+ if (bargc == 1)
+ env_setenv("currdev", EV_VOLATILE, bargv[0], ofw_setcurrdev,
+ env_nounset);
+ else
+ env_setenv("currdev", EV_VOLATILE, bootpath,
+ ofw_setcurrdev, env_nounset);
env_setenv("loaddev", EV_VOLATILE, bootpath, env_noset,
env_nounset);
setenv("LINES", "24", 1); /* optional */
==== //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#7 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.13 2003/04/16 21:09:41 phk Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.14 2003/12/21 12:38:25 grehan Exp $
*/
#include <stand.h>
@@ -47,7 +47,8 @@
* device, go with the current device.
*/
if ((devspec == NULL) ||
- (strchr(devspec, '@') == NULL)) {
+ ((strchr(devspec, '@') == NULL) &&
+ (strchr(devspec, ':') == NULL))) {
if (((rv = ofw_parsedev(dev, getenv("currdev"), NULL)) == 0) &&
(path != NULL))
@@ -112,7 +113,7 @@
}
int
-ofw_setcurrdev(struct env_var *ev, int flags, void *value)
+ofw_setcurrdev(struct env_var *ev, int flags, const void *value)
{
struct ofw_devdesc *ncurr;
int rv;
==== //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#6 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.5 2003/05/01 03:56:30 peter Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.6 2003/12/21 12:27:01 grehan Exp $
*/
#include <sys/param.h>
@@ -42,7 +42,7 @@
extern vm_offset_t reloc; /* From <arch>/conf.c */
int
-__elfN(ofw_loadfile)(char *filename, vm_offset_t dest,
+__elfN(ofw_loadfile)(char *filename, u_int64_t dest,
struct preloaded_file **result)
{
int r;
@@ -52,6 +52,9 @@
if (r != 0)
return (r);
+#if defined(__powerpc__)
+ __syncicache((void *) (*result)->f_addr, (*result)->f_size);
+#endif
return (0);
}
==== //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#6 (text+ko) ====
@@ -22,7 +22,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ofw/libofw/libofw.h,v 1.7 2002/11/10 19:17:36 jake Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/libofw.h,v 1.8 2003/12/21 12:38:25 grehan Exp $
*/
#include "openfirm.h"
@@ -36,7 +36,7 @@
};
extern int ofw_getdev(void **vdev, const char *devspec, const char **path);
-extern int ofw_setcurrdev(struct env_var *ev, int flags, void *value);
+extern ev_sethook_t ofw_setcurrdev;
extern struct devsw ofwdisk;
extern struct netif_driver ofwnet;
==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.11 2002/07/18 12:39:02 benno Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.12 2003/12/21 12:19:38 grehan Exp $
*/
/*
* MD primitives supporting placement of module data
@@ -98,7 +98,8 @@
got = read(fd, buf, get);
if (got <= 0) {
- printf("ofw_readin: read failed\n");
+ if (got < 0)
+ printf("ofw_readin: read failed\n");
break;
}
==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#8 (text+ko) ====
@@ -22,7 +22,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.9 2003/04/16 21:09:41 phk Exp $
+ * $FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.10 2003/12/21 12:16:58 grehan Exp $
*/
/*
@@ -70,7 +70,7 @@
size_t *rsize)
{
struct ofw_devdesc *dp = (struct ofw_devdesc *)devdata;
- unsigned long pos;
+ daddr_t pos;
int n;
int i, j;
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.15 2003/11/07 21:27:13 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.16 2003/12/11 02:34:49 peter Exp $");
#include "opt_compat.h"
@@ -761,29 +761,21 @@
freebsd32_gettimeofday(struct thread *td,
struct freebsd32_gettimeofday_args *uap)
{
- int error;
- caddr_t sg;
- struct timeval32 *p32, s32;
- struct timeval *p = NULL, s;
+ struct timeval atv;
+ struct timeval32 atv32;
+ struct timezone rtz;
+ int error = 0;
- p32 = uap->tp;
- if (p32) {
- sg = stackgap_init();
- p = stackgap_alloc(&sg, sizeof(struct timeval));
- uap->tp = (struct timeval32 *)p;
+ if (uap->tp) {
+ microtime(&atv);
+ CP(atv, atv32, tv_sec);
+ CP(atv, atv32, tv_usec);
+ error = copyout(&atv32, uap->tp, sizeof (atv32));
}
- error = gettimeofday(td, (struct gettimeofday_args *) uap);
- if (error)
- return (error);
- if (p32) {
- error = copyin(p, &s, sizeof(s));
- if (error)
- return (error);
- CP(s, s32, tv_sec);
- CP(s, s32, tv_usec);
- error = copyout(&s32, p32, sizeof(s32));
- if (error)
- return (error);
+ if (error == 0 && uap->tzp != NULL) {
+ rtz.tz_minuteswest = tz_minuteswest;
+ rtz.tz_dsttime = tz_dsttime;
+ error = copyout(&rtz, uap->tzp, sizeof (rtz));
}
return (error);
}
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.14 2003/11/08 07:31:49 peter Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.16 2003/12/11 02:36:37 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp
*/
#ifndef _FREEBSD32_SYSPROTO_H_
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.14 2003/11/08 07:31:49 peter Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.16 2003/12/11 02:36:37 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp
*/
#define FREEBSD32_SYS_syscall 0
@@ -53,7 +53,7 @@
#define FREEBSD32_SYS_getlogin 49
#define FREEBSD32_SYS_setlogin 50
#define FREEBSD32_SYS_acct 51
-#define FREEBSD32_SYS_sigpending 52
+ /* 52 is obsolete osigpending */
#define FREEBSD32_SYS_freebsd32_sigaltstack 53
#define FREEBSD32_SYS_ioctl 54
#define FREEBSD32_SYS_reboot 55
@@ -98,7 +98,7 @@
#define FREEBSD32_SYS_setpriority 96
#define FREEBSD32_SYS_socket 97
#define FREEBSD32_SYS_connect 98
-#define FREEBSD32_SYS_accept 99
+ /* 99 is obsolete oaccept */
#define FREEBSD32_SYS_getpriority 100
/* 101 is obsolete osend */
/* 102 is obsolete orecv */
@@ -123,7 +123,7 @@
#define FREEBSD32_SYS_freebsd32_settimeofday 122
#define FREEBSD32_SYS_fchown 123
#define FREEBSD32_SYS_fchmod 124
-#define FREEBSD32_SYS_recvfrom 125
+ /* 125 is obsolete orecvfrom */
#define FREEBSD32_SYS_setreuid 126
#define FREEBSD32_SYS_setregid 127
#define FREEBSD32_SYS_rename 128
@@ -149,7 +149,7 @@
#define FREEBSD32_SYS_quotactl 148
/* 149 is obsolete oquota */
/* 150 is obsolete ogetsockname */
-#define FREEBSD32_SYS_getdirentries 156
+ /* 156 is obsolete ogetdirentries */
#define FREEBSD32_SYS_freebsd32_statfs 157
#define FREEBSD32_SYS_freebsd32_fstatfs 158
#define FREEBSD32_SYS_getfh 161
@@ -295,4 +295,4 @@
#define FREEBSD32_SYS__umtx_lock 434
#define FREEBSD32_SYS__umtx_unlock 435
#define FREEBSD32_SYS_jail_attach 436
-#define FREEBSD32_SYS_MAXSYSCALL 437
+#define FREEBSD32_SYS_MAXSYSCALL 441
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.5 2003/11/08 07:31:49 peter Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.7 2003/12/11 02:36:37 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp
*/
const char *freebsd32_syscallnames[] = {
@@ -59,7 +59,7 @@
"getlogin", /* 49 = getlogin */
"setlogin", /* 50 = setlogin */
"acct", /* 51 = acct */
- "sigpending", /* 52 = sigpending */
+ "obs_osigpending", /* 52 = obsolete osigpending */
"freebsd32_sigaltstack", /* 53 = freebsd32_sigaltstack */
"ioctl", /* 54 = ioctl */
"reboot", /* 55 = reboot */
@@ -106,7 +106,7 @@
"setpriority", /* 96 = setpriority */
"socket", /* 97 = socket */
"connect", /* 98 = connect */
- "accept", /* 99 = accept */
+ "obs_oaccept", /* 99 = obsolete oaccept */
"getpriority", /* 100 = getpriority */
"obs_osend", /* 101 = obsolete osend */
"obs_orecv", /* 102 = obsolete orecv */
@@ -132,7 +132,7 @@
"freebsd32_settimeofday", /* 122 = freebsd32_settimeofday */
"fchown", /* 123 = fchown */
"fchmod", /* 124 = fchmod */
- "recvfrom", /* 125 = recvfrom */
+ "obs_orecvfrom", /* 125 = obsolete orecvfrom */
"setreuid", /* 126 = setreuid */
"setregid", /* 127 = setregid */
"rename", /* 128 = rename */
@@ -163,7 +163,7 @@
"#153", /* 153 = asyncdaemon */
"#154", /* 154 = nosys */
"#155", /* 155 = nfssvc */
- "getdirentries", /* 156 = getdirentries */
+ "obs_ogetdirentries", /* 156 = obsolete ogetdirentries */
"freebsd32_statfs", /* 157 = freebsd32_statfs */
"freebsd32_fstatfs", /* 158 = freebsd32_fstatfs */
"#159", /* 159 = nosys */
@@ -444,4 +444,8 @@
"_umtx_lock", /* 434 = _umtx_lock */
"_umtx_unlock", /* 435 = _umtx_unlock */
"jail_attach", /* 436 = jail_attach */
+ "#437", /* 437 = extattr_list_fd */
+ "#438", /* 438 = extattr_list_file */
+ "#439", /* 439 = extattr_list_link */
+ "#440", /* 440 = kse_switchin */
};
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.15 2003/11/08 07:31:49 peter Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.17 2003/12/11 02:36:37 peter Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp
*/
#include "opt_compat.h"
@@ -77,7 +77,7 @@
{ SYF_MPSAFE | AS(getlogin_args), (sy_call_t *)getlogin }, /* 49 = getlogin */
{ SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin }, /* 50 = setlogin */
{ SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct }, /* 51 = acct */
- { SYF_MPSAFE | 0, (sy_call_t *)sigpending }, /* 52 = sigpending */
+ { 0, (sy_call_t *)nosys }, /* 52 = obsolete osigpending */
{ SYF_MPSAFE | AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack }, /* 53 = freebsd32_sigaltstack */
{ SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl }, /* 54 = ioctl */
{ SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot }, /* 55 = reboot */
@@ -124,7 +124,7 @@
{ SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority }, /* 96 = setpriority */
{ SYF_MPSAFE | AS(socket_args), (sy_call_t *)socket }, /* 97 = socket */
{ SYF_MPSAFE | AS(connect_args), (sy_call_t *)connect }, /* 98 = connect */
- { SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept }, /* 99 = accept */
+ { 0, (sy_call_t *)nosys }, /* 99 = obsolete oaccept */
{ SYF_MPSAFE | AS(getpriority_args), (sy_call_t *)getpriority }, /* 100 = getpriority */
{ 0, (sy_call_t *)nosys }, /* 101 = obsolete osend */
{ 0, (sy_call_t *)nosys }, /* 102 = obsolete orecv */
@@ -141,7 +141,7 @@
{ 0, (sy_call_t *)nosys }, /* 113 = obsolete orecvmsg */
{ 0, (sy_call_t *)nosys }, /* 114 = obsolete osendmsg */
{ 0, (sy_call_t *)nosys }, /* 115 = obsolete vtrace */
- { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */
+ { SYF_MPSAFE | AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday }, /* 116 = freebsd32_gettimeofday */
{ AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage }, /* 117 = freebsd32_getrusage */
{ SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt }, /* 118 = getsockopt */
{ 0, (sy_call_t *)nosys }, /* 119 = resuba */
@@ -150,7 +150,7 @@
{ AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday }, /* 122 = freebsd32_settimeofday */
{ AS(fchown_args), (sy_call_t *)fchown }, /* 123 = fchown */
{ AS(fchmod_args), (sy_call_t *)fchmod }, /* 124 = fchmod */
- { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom }, /* 125 = recvfrom */
+ { 0, (sy_call_t *)nosys }, /* 125 = obsolete orecvfrom */
{ SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 126 = setreuid */
{ SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 127 = setregid */
{ AS(rename_args), (sy_call_t *)rename }, /* 128 = rename */
@@ -181,7 +181,7 @@
{ 0, (sy_call_t *)nosys }, /* 153 = asyncdaemon */
{ 0, (sy_call_t *)nosys }, /* 154 = nosys */
{ 0, (sy_call_t *)nosys }, /* 155 = nfssvc */
- { AS(getdirentries_args), (sy_call_t *)getdirentries }, /* 156 = getdirentries */
+ { 0, (sy_call_t *)nosys }, /* 156 = obsolete ogetdirentries */
{ AS(freebsd32_statfs_args), (sy_call_t *)freebsd32_statfs }, /* 157 = freebsd32_statfs */
{ AS(freebsd32_fstatfs_args), (sy_call_t *)freebsd32_fstatfs }, /* 158 = freebsd32_fstatfs */
{ 0, (sy_call_t *)nosys }, /* 159 = nosys */
@@ -462,4 +462,8 @@
{ SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */
{ SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock }, /* 435 = _umtx_unlock */
{ SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach }, /* 436 = jail_attach */
+ { 0, (sy_call_t *)nosys }, /* 437 = extattr_list_fd */
+ { 0, (sy_call_t *)nosys }, /* 438 = extattr_list_file */
+ { 0, (sy_call_t *)nosys }, /* 439 = extattr_list_link */
+ { 0, (sy_call_t *)nosys }, /* 440 = kse_switchin */
};
==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#4 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.26 2003/11/08 07:31:30 peter Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.29 2003/12/11 02:36:07 peter Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -110,7 +110,7 @@
49 MNOPROTO BSD { int getlogin(char *namebuf, u_int namelen); }
50 MNOPROTO BSD { int setlogin(char *namebuf); }
51 MNOPROTO BSD { int acct(char *path); }
-52 MNOPROTO POSIX { int sigpending(void); }
+52 OBSOL POSIX osigpending
53 MSTD BSD { int freebsd32_sigaltstack(struct sigaltstack32 *ss, \
struct sigaltstack32 *oss); }
54 MNOPROTO POSIX { int ioctl(int fd, u_long com, caddr_t data); }
@@ -171,8 +171,7 @@
96 MNOPROTO BSD { int setpriority(int which, int who, int prio); }
97 MNOPROTO BSD { int socket(int domain, int type, int protocol); }
98 MNOPROTO BSD { int connect(int s, caddr_t name, int namelen); }
-99 MNOPROTO BSD { int accept(int s, caddr_t name, int *anamelen); } \
- accept accept_args int
+99 OBSOL BSD oaccept
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list