Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/yamt-lazymbuf]: src/sys sync with head.
details: https://anonhg.NetBSD.org/src/rev/0491089b012b
branches: yamt-lazymbuf
changeset: 582776:0491089b012b
user: yamt <yamt%NetBSD.org@localhost>
date: Mon Feb 11 14:59:26 2008 +0000
description:
sync with head.
diffstat:
sys/arch/acorn32/acorn32/rpc_machdep.c | 80 +-
sys/arch/alpha/a12/if_ade.c | 12 +-
sys/arch/alpha/alpha/ipifuncs.c | 6 +-
sys/arch/alpha/alpha/linux_syscall.c | 8 +-
sys/arch/alpha/alpha/osf1_syscall.c | 8 +-
sys/arch/alpha/alpha/syscall.c | 8 +-
sys/arch/amd64/amd64/copy.S | 166 +-
sys/arch/amd64/amd64/cpufunc.S | 5 +-
sys/arch/amd64/amd64/linux32_syscall.c | 20 +-
sys/arch/amd64/amd64/linux_syscall.c | 8 +-
sys/arch/amd64/amd64/netbsd32_syscall.c | 8 +-
sys/arch/amd64/amd64/syscall.c | 8 +-
sys/arch/amd64/include/frame_regs.h | 13 +-
sys/arch/amigappc/amigappc/locore.S | 5 +-
sys/arch/arm/arm/linux_syscall.c | 12 +-
sys/arch/arm/arm/lock_cas.S | 11 +-
sys/arch/arm/arm/syscall.c | 10 +-
sys/arch/arm/iomd/vidcvideo.c | 80 +-
sys/arch/bebox/bebox/locore.S | 5 +-
sys/arch/bebox/bebox/machdep.c | 59 +-
sys/arch/bebox/bebox/mainbus.c | 18 +-
sys/arch/bebox/bebox/pic_bebox.c | 33 +-
sys/arch/bebox/conf/std.bebox | 4 +-
sys/arch/bebox/include/intr.h | 12 +-
sys/arch/evbppc/ev64260/ev64260_locore.S | 4 +-
sys/arch/evbppc/pmppc/pmppc_locore.S | 5 +-
sys/arch/hp700/hp700/machdep.c | 6 +-
sys/arch/hppa/hppa/lock_stubs.S | 11 +-
sys/arch/hppa/hppa/trap.c | 11 +-
sys/arch/hppa/include/vmparam.h | 5 +-
sys/arch/i386/conf/ALL | 5 +-
sys/arch/i386/i386/cpu_in_cksum.S | 6 +-
sys/arch/i386/i386/freebsd_syscall.c | 8 +-
sys/arch/i386/i386/ibcs2_syscall.c | 8 +-
sys/arch/i386/i386/linux_syscall.c | 8 +-
sys/arch/i386/i386/mach_syscall.c | 8 +-
sys/arch/i386/i386/svr4_syscall.c | 8 +-
sys/arch/i386/i386/syscall.c | 8 +-
sys/arch/i386/include/cpu.h | 6 +-
sys/arch/i386/isa/npx.c | 5 +-
sys/arch/i386/stand/lib/netif/i82557.c | 4 +-
sys/arch/i386/stand/mbr/mbr.S | 8 +-
sys/arch/ibmnws/ibmnws/locore.S | 5 +-
sys/arch/m68k/m68k/linux_syscall.c | 8 +-
sys/arch/m68k/m68k/m68k_syscall.c | 8 +-
sys/arch/m68k/m68k/sunos_syscall.c | 8 +-
sys/arch/macppc/macppc/locore.S | 4 +-
sys/arch/mips/adm5120/dev/if_admsw.c | 8 +-
sys/arch/mips/mips/lock_stubs.S | 24 +-
sys/arch/mips/mips/syscall.c | 8 +-
sys/arch/mips/sibyte/dev/sbmac.c | 11 +-
sys/arch/mvmeppc/mvmeppc/locore.S | 5 +-
sys/arch/ofppc/conf/GENERIC | 5 +-
sys/arch/ofppc/conf/GENERIC_B64 | 440 --
sys/arch/ofppc/conf/INSTALL_B64 | 12 -
sys/arch/ofppc/conf/std.ofppc | 3 +-
sys/arch/ofppc/conf/std.ofppc.bridge | 16 -
sys/arch/ofppc/include/cpu.h | 4 +-
sys/arch/ofppc/ofppc/cpu.c | 82 +-
sys/arch/ofppc/ofppc/locore.S | 18 +-
sys/arch/ofppc/ofppc/mainbus.c | 6 +-
sys/arch/powerpc/conf/files.powerpc | 18 +-
sys/arch/powerpc/include/bat.h | 4 +-
sys/arch/powerpc/include/cpu.h | 15 +-
sys/arch/powerpc/include/cpu_counter.h | 4 +-
sys/arch/powerpc/include/oea/bat.h | 4 +-
sys/arch/powerpc/include/oea/cpufeat.h | 54 +
sys/arch/powerpc/include/oea/pmap.h | 157 +-
sys/arch/powerpc/include/oea/pte.h | 26 +-
sys/arch/powerpc/include/oea/vmparam.h | 14 +-
sys/arch/powerpc/marvell/bus_dma.c | 28 +-
sys/arch/powerpc/oea/cpu_subr.c | 31 +-
sys/arch/powerpc/oea/genassym.cf | 11 +-
sys/arch/powerpc/oea/oea_machdep.c | 55 +-
sys/arch/powerpc/oea/ofwoea_machdep.c | 39 +-
sys/arch/powerpc/oea/pmap.c | 957 ++--
sys/arch/powerpc/oea/pmap64.c | 4 +
sys/arch/powerpc/oea/pmap64_bridge.c | 4 +
sys/arch/powerpc/powerpc/bus_space.c | 92 +-
sys/arch/powerpc/powerpc/clock.c | 21 +-
sys/arch/powerpc/powerpc/db_trace.c | 8 +-
sys/arch/powerpc/powerpc/kgdb_machdep.c | 16 +-
sys/arch/powerpc/powerpc/locore_subr.S | 8 +-
sys/arch/powerpc/powerpc/pmap_subr.c | 225 +-
sys/arch/powerpc/powerpc/powerpc_machdep.c | 12 +-
sys/arch/powerpc/powerpc/syscall.c | 8 +-
sys/arch/powerpc/powerpc/trap.c | 12 +-
sys/arch/powerpc/powerpc/trap_subr.S | 195 +-
sys/arch/prep/conf/std.prep | 3 +-
sys/arch/prep/prep/locore.S | 4 +-
sys/arch/rs6000/conf/std.rs6000 | 3 +-
sys/arch/rs6000/rs6000/locore.S | 5 +-
sys/arch/sandpoint/sandpoint/locore.S | 5 +-
sys/arch/sgimips/dev/crmfb.c | 516 ++-
sys/arch/sgimips/dev/crmfbreg.h | 138 +-
sys/arch/sh3/sh3/lock_stubs.S | 11 +-
sys/arch/sh3/sh3/syscall.c | 6 +-
sys/arch/shark/conf/GENERIC | 7 +-
sys/arch/shark/conf/GENERIC.local | 4 +
sys/arch/shark/conf/OFWGENCFG | 5 +-
sys/arch/sparc/sparc/syscall.c | 8 +-
sys/arch/sparc64/sparc64/autoconf.c | 15 +-
sys/arch/sparc64/sparc64/syscall.c | 8 +-
sys/arch/sun3/dev/xd.c | 50 +-
sys/arch/sun3/dev/xy.c | 56 +-
sys/arch/vax/vax/lock_stubs.S | 11 +-
sys/arch/vax/vax/subr.S | 3 +-
sys/arch/vax/vax/syscall.c | 8 +-
sys/arch/x86/x86/cpu.c | 12 +-
sys/arch/x86/x86/pmap.c | 62 +-
sys/compat/linux/common/linux_socket.c | 10 +-
sys/compat/linux32/arch/amd64/linux32_syscall.h | 6 +-
sys/compat/linux32/arch/amd64/linux32_syscallargs.h | 15 +-
sys/compat/linux32/arch/amd64/linux32_syscalls.c | 8 +-
sys/compat/linux32/arch/amd64/linux32_sysent.c | 8 +-
sys/compat/linux32/arch/amd64/syscalls.master | 7 +-
sys/compat/linux32/common/linux32_fcntl.c | 40 +-
sys/dev/ata/ata_raid_via.c | 6 +-
sys/dev/cardbus/cardbus.c | 6 +-
sys/dev/cardbus/if_tlp_cardbus.c | 11 +-
sys/dev/i2o/iopio.h | 4 +-
sys/dev/ic/ahcisata_core.c | 5 +-
sys/dev/ic/ahcisatavar.h | 3 +-
sys/dev/ic/elinkxl.c | 18 +-
sys/dev/ic/gem.c | 18 +-
sys/dev/ic/hme.c | 25 +-
sys/dev/ic/i82557.c | 32 +-
sys/dev/ic/midway.c | 12 +-
sys/dev/ic/nslm7x.c | 28 +-
sys/dev/ic/pdq_ifsubr.c | 11 +-
sys/dev/ic/rtl8169.c | 30 +-
sys/dev/ic/rtl81x9reg.h | 8 +-
sys/dev/ic/tropic.c | 8 +-
sys/dev/ieee1394/if_fwip.c | 11 +-
sys/dev/if_ndis/if_ndis.c | 23 +-
sys/dev/kttcp.c | 8 +-
sys/dev/marvell/if_gfe.c | 7 +-
sys/dev/pci/ahcisata_pci.c | 13 +-
sys/dev/pci/cxgb_main.c | 28 +-
sys/dev/pci/files.pci | 7 +-
sys/dev/pci/if_bge.c | 55 +-
sys/dev/pci/if_bnx.c | 20 +-
sys/dev/pci/if_bnxreg.h | 4 +-
sys/dev/pci/if_de.c | 14 +-
sys/dev/pci/if_dge.c | 32 +-
sys/dev/pci/if_iwn.c | 3843 +++++++++++++++++++
sys/dev/pci/if_iwnreg.h | 999 ++++
sys/dev/pci/if_iwnvar.h | 217 +
sys/dev/pci/if_kse.c | 20 +-
sys/dev/pci/if_lmc.c | 8 +-
sys/dev/pci/if_msk.c | 7 +-
sys/dev/pci/if_nfe.c | 22 +-
sys/dev/pci/if_sip.c | 20 +-
sys/dev/pci/if_sk.c | 22 +-
sys/dev/pci/if_stge.c | 20 +-
sys/dev/pci/if_ti.c | 30 +-
sys/dev/pci/if_txp.c | 17 +-
sys/dev/pci/if_vge.c | 20 +-
sys/dev/pci/if_wm.c | 20 +-
sys/dev/pci/if_xge.c | 20 +-
sys/dev/pci/jmide.c | 9 +-
sys/dev/pci/mpt_pci.c | 10 +-
sys/dev/pci/pcidevs | 13 +-
sys/dev/pci/pcidevs.h | 15 +-
sys/dev/pci/pcidevs_data.h | 50 +-
sys/dev/pci/piixpm.c | 6 +-
sys/dev/pci/svwsata.c | 9 +-
sys/dev/ppbus/if_plip.c | 11 +-
sys/dev/usb/if_aue.c | 10 +-
sys/dev/usb/if_axe.c | 10 +-
sys/dev/usb/if_cdce.c | 10 +-
sys/dev/usb/if_cue.c | 10 +-
sys/dev/usb/if_kue.c | 10 +-
sys/dev/usb/if_upl.c | 8 +-
sys/dev/usb/ubsavar.h | 3 +-
sys/dev/usb/uhmodem.c | 269 +-
sys/dev/usb/usbdevs | 3 +-
sys/dev/usb/usbdevs.h | 5 +-
sys/dev/usb/usbdevs_data.h | 10 +-
sys/dev/vme/xd.c | 50 +-
sys/dev/vme/xy.c | 56 +-
sys/dist/pf/net/pf_norm.c | 6 +-
sys/fs/adosfs/advfsops.c | 6 +-
sys/fs/filecorefs/filecore_vfsops.c | 6 +-
sys/fs/smbfs/smbfs_kq.c | 102 +-
sys/fs/tmpfs/tmpfs.h | 12 +-
sys/fs/tmpfs/tmpfs_pool.c | 6 +-
sys/fs/tmpfs/tmpfs_subr.c | 8 +-
sys/fs/tmpfs/tmpfs_vfsops.c | 10 +-
sys/fs/tmpfs/tmpfs_vnops.c | 6 +-
sys/fs/union/union_vnops.c | 5 +-
sys/kern/kern_descrip.c | 19 +-
sys/kern/kern_drvctl.c | 49 +-
sys/kern/kern_ktrace.c | 24 +-
sys/kern/kern_sig.c | 8 +-
sys/kern/kern_softint.c | 8 +-
sys/kern/kern_subr.c | 14 +-
sys/kern/kern_tc.c | 37 +-
sys/kern/subr_autoconf.c | 53 +-
sys/kern/subr_kmem.c | 29 +-
sys/kern/subr_pool.c | 6 +-
sys/kern/sys_sched.c | 105 +-
sys/kern/sys_socket.c | 16 +-
sys/kern/sys_syscall.c | 13 +-
sys/kern/syscalls.master | 6 +-
sys/kern/uipc_socket.c | 11 +-
sys/kern/uipc_socket2.c | 5 +-
sys/kern/uipc_syscalls.c | 8 +-
sys/kern/vfs_subr.c | 12 +-
sys/kern/vfs_subr2.c | 6 +-
sys/miscfs/fifofs/fifo_vnops.c | 13 +-
sys/miscfs/genfs/genfs_vnops.c | 84 +-
sys/modules/example/Makefile | 9 +-
sys/net/if.c | 92 +-
sys/net/if.h | 5 +-
sys/net/if_ecosubr.c | 13 +-
sys/net/if_ethersubr.c | 13 +-
sys/net/if_faith.c | 7 +-
sys/net/if_gif.c | 17 +-
sys/net/if_gre.c | 10 +-
sys/net/if_ieee1394subr.c | 10 +-
sys/net/if_loop.c | 12 +-
sys/net/if_ppp.c | 11 +-
sys/net/if_pppoe.c | 14 +-
sys/net/if_sl.c | 11 +-
sys/net/if_spppsubr.c | 37 +-
sys/net/if_srt.c | 12 +-
sys/net/if_stf.c | 15 +-
sys/net/if_tun.c | 22 +-
sys/net/if_vlan.c | 20 +-
sys/net/route.h | 4 +-
sys/net80211/ieee80211_ioctl.c | 12 +-
sys/netbt/hci.h | 346 +-
sys/netbt/hci_event.c | 72 +-
sys/netbt/hci_socket.c | 50 +-
sys/netinet/in.c | 5 +-
sys/netinet/in4_cksum.c | 146 +-
sys/netinet/in_var.h | 43 +-
sys/netinet/ip_id.c | 176 +-
sys/netinet/ip_input.c | 5 +-
sys/netinet/ip_mroute.c | 8 +-
sys/netinet/ip_output.c | 51 +-
sys/netinet/ip_var.h | 43 +-
sys/netinet/raw_ip.c | 8 +-
sys/netinet/tcp_input.c | 53 +-
sys/netinet/tcp_subr.c | 12 +-
sys/netinet6/ipsec.c | 6 +-
sys/netipsec/xform_ipip.c | 6 +-
sys/netisdn/i4b_ipr.c | 8 +-
sys/netiso/tp_usrreq.c | 8 +-
sys/nfs/nfs_kq.c | 72 +-
sys/opencrypto/crypto.c | 75 +-
sys/opencrypto/cryptodev.c | 52 +-
sys/sys/atomic.h | 13 +-
sys/sys/cc_microtime.h | 3 +-
sys/sys/device.h | 4 +-
sys/sys/file.h | 17 +-
sys/sys/ktrace.h | 9 +-
sys/sys/param.h | 4 +-
sys/sys/sched.h | 9 +-
sys/sys/socketvar.h | 4 +-
sys/sys/syscall.h | 6 +-
sys/sys/syscallargs.h | 4 +-
sys/sys/systm.h | 7 +-
sys/sys/vnode.h | 44 +-
sys/ufs/ext2fs/ext2fs_vfsops.c | 6 +-
sys/uvm/uvm_glue.c | 22 +-
sys/uvm/uvm_pdaemon.c | 14 +-
sys/uvm/uvm_pdpolicy_clockpro.c | 19 +-
269 files changed, 9888 insertions(+), 3344 deletions(-)
diffs (truncated from 22379 to 300 lines):
diff -r ed5d33106625 -r 0491089b012b sys/arch/acorn32/acorn32/rpc_machdep.c
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c Mon Feb 11 14:54:36 2008 +0000
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c Mon Feb 11 14:59:26 2008 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.60.10.4 2008/02/04 09:21:36 yamt Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.60.10.5 2008/02/11 14:59:26 yamt Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -54,7 +54,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.60.10.4 2008/02/04 09:21:36 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.60.10.5 2008/02/11 14:59:26 yamt Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -136,6 +136,7 @@
extern struct bus_space iomd_bs_tag;
paddr_t physical_start;
+paddr_t kernel_start;
paddr_t physical_freestart;
paddr_t physical_freeend;
paddr_t physical_end;
@@ -506,7 +507,7 @@
* note that this will stop working after we switch to the new
* L1 Table
*/
- memset((void *) (videomemory.vidm_vbase), 0x55, 50*1024);
+ memset((void *) (videomemory.vidm_vbase), 0x55, videomemory.vidm_size);
consinit();
printf("\n\n\n\n\n\n\n");
#define VERBOSE_INIT_ARM
@@ -559,12 +560,12 @@
}
};
- /* Kinetics can only DMA from the Normal DRAM */
if (hasKinetic)
{
+ /* Kinetics can only DMA from the Normal DRAM */
dma_range_begin = 0xffffffff;
dma_range_end = 0;
- for (loop = 0, physmem = 0; loop < bootconfig.dramblocks; ++loop) {
+ for (loop = 0; loop < bootconfig.dramblocks; ++loop) {
if (bootconfig.dram[loop].flags == PHYSMEM_TYPE_GENERIC) {
if (bootconfig.dram[loop].address < dma_range_begin)
dma_range_begin = bootconfig.dram[loop].address;
@@ -572,34 +573,25 @@
bootconfig.dram[loop].pages * PAGE_SIZE;
if (memoryblock_end > dma_range_end)
dma_range_end = memoryblock_end;
- physmem += bootconfig.dram[loop].pages;
}
}
- dma_range_end = (paddr_t) MIN(dma_range_end, 512*1024*1024);
+ dma_range_end = (paddr_t) MIN(dma_range_end, 256*1024*1024);
} else {
- /* constants for now, but might be changed/configured */
+ /* everything else DMAs all the memory */
dma_range_begin = (paddr_t) physical_start;
dma_range_end = (paddr_t) MIN(physical_end, 512*1024*1024);
}
-
+
+ /* set the location of the kernel in physical memory */
if (hasKinetic) {
- /* hack hack - throw away the slow dram */
- for (loop = 0; loop < bootconfig.dramblocks; ++loop) {
- if (bootconfig.dram[loop].flags == PHYSMEM_TYPE_GENERIC) {
- /* non kinetic ram */
- physmem -= bootconfig.dram[loop].pages;
- bootconfig.drampages -=
- bootconfig.dram[loop].pages;
- }
- }
- physical_start = kinetic_physical_start;
+ kernel_start = kinetic_physical_start;
+ } else {
+ kernel_start = physical_start;
}
-
- physical_freestart = physical_start;
+ physical_freestart = kernel_start;
free_pages = bootconfig.drampages;
physical_freeend = physical_end;
-
/*
* AHUM !! set this variable ... it was set up in the old 1st
* stage bootloader
@@ -607,15 +599,14 @@
kerneldatasize = bootconfig.kernsize + bootconfig.MDFsize;
/* Update the address of the first free page of physical memory */
- /* XXX Assumption that the kernel and stuff is at the LOWEST physical memory address? XXX */
physical_freestart +=
- bootconfig.kernsize + bootconfig.MDFsize + bootconfig.scratchsize;
- free_pages -= (physical_freestart - physical_start) / PAGE_SIZE;
+ bootconfig.kernsize + bootconfig.scratchsize;
+ free_pages -= (bootconfig.kernsize + bootconfig.scratchsize) / PAGE_SIZE;
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
alloc_pages((var).pv_pa, (np)); \
- (var).pv_va = KERNEL_BASE + (var).pv_pa - physical_start;
+ (var).pv_va = KERNEL_BASE + (var).pv_pa - kernel_start;
#define alloc_pages(var, np) \
(var) = physical_freestart; \
@@ -679,7 +670,7 @@
* in recent versions of the pmap code. Due to the calls used there
* we cannot allocate virtual memory during bootstrap.
*/
- sa110_cc_base = (KERNEL_BASE + (physical_freestart - physical_start)
+ sa110_cc_base = (KERNEL_BASE + (physical_freestart - kernel_start)
+ (CPU_SA110_CACHE_CLEAN_SIZE - 1))
& ~(CPU_SA110_CACHE_CLEAN_SIZE - 1);
#endif /* CPU_SA110 */
@@ -731,15 +722,15 @@
if (N_GETMAGIC(kernexec[0]) == ZMAGIC) {
#if defined(CPU_ARM6) || defined(CPU_ARM7)
logical = pmap_map_chunk(l1pagetable, KERNEL_TEXT_BASE,
- physical_start, kernexec->a_text,
+ kernel_start, kernexec->a_text,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
#else /* CPU_ARM6 || CPU_ARM7 */
logical = pmap_map_chunk(l1pagetable, KERNEL_TEXT_BASE,
- physical_start, kernexec->a_text,
+ kernel_start, kernexec->a_text,
VM_PROT_READ, PTE_CACHE);
#endif /* CPU_ARM6 || CPU_ARM7 */
logical += pmap_map_chunk(l1pagetable,
- KERNEL_TEXT_BASE + logical, physical_start + logical,
+ KERNEL_TEXT_BASE + logical, kernel_start + logical,
kerneldatasize - kernexec->a_text,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
} else { /* !ZMAGIC */
@@ -749,7 +740,7 @@
* read/write area's ...
*/
pmap_map_chunk(l1pagetable, KERNEL_TEXT_BASE,
- physical_start, kerneldatasize,
+ kernel_start, kerneldatasize,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
};
@@ -822,8 +813,6 @@
* REAL kernel page tables.
*/
- cpu_control(CPU_CONTROL_SYST_ENABLE | CPU_CONTROL_ROM_ENABLE, CPU_CONTROL_SYST_ENABLE);
-
/* be a client to all domains */
cpu_domains(0x55555555);
@@ -966,16 +955,21 @@
paddr_t start = (paddr_t)bootconfig.dram[loop].address;
paddr_t end = start + (bootconfig.dram[loop].pages * PAGE_SIZE);
- if (start < physical_freestart)
- start = physical_freestart;
- if (end > physical_freeend)
- end = physical_freeend;
+ if (end > physical_freestart)
+ {
+ if (start < physical_freestart)
+ start = physical_freestart;
+ if (end > physical_freeend)
+ end = physical_freeend;
+ }
- /* XXX Consider DMA range intersection checking. */
-
- if (!hasKinetic || bootconfig.dram[loop].flags & PHYSMEM_TYPE_PROCESSOR_ONLY)
- uvm_page_physload(atop(start), atop(end),
- atop(start), atop(end), VM_FREELIST_DEFAULT);
+ if (bootconfig.dram[loop].flags & PHYSMEM_TYPE_PROCESSOR_ONLY) {
+ uvm_page_physload(atop(start), atop(end),
+ atop(start), atop(end), VM_FREELIST_DEFAULT);
+ } else {
+ uvm_page_physload(atop(start), atop(end),
+ atop(start), atop(end), VM_FREELIST_RPCDMA);
+ }
}
/* Boot strap pmap telling it where the kernel page table is */
@@ -1031,6 +1025,8 @@
printf(" VRAM block 0 at %08x size %08x\n\r",
bootconfig.vram[0].address,
bootconfig.vram[0].pages * bootconfig.pagesize);
+ if (hasKinetic)
+ printf("%s", " Kinetic memory was detected\n\r");
/*
* Get a handle on the I2C interface so we can read
diff -r ed5d33106625 -r 0491089b012b sys/arch/alpha/a12/if_ade.c
--- a/sys/arch/alpha/a12/if_ade.c Mon Feb 11 14:54:36 2008 +0000
+++ b/sys/arch/alpha/a12/if_ade.c Mon Feb 11 14:59:26 2008 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ade.c,v 1.23.12.5 2007/11/15 11:42:26 yamt Exp $ */
+/* $NetBSD: if_ade.c,v 1.23.12.6 2008/02/11 14:59:26 yamt Exp $ */
/*
* NOTE: this version of if_de was modified for bounce buffers prior
@@ -81,7 +81,7 @@
#define LCLDMA 1
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ade.c,v 1.23.12.5 2007/11/15 11:42:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ade.c,v 1.23.12.6 2008/02/11 14:59:26 yamt Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -4033,11 +4033,13 @@
error = EINVAL;
break;
}
- ifp->if_mtu = ifr->ifr_mtu;
+ if ((error = ifioctl_common(ifp, cmd, data)) == ENETRESET) {
#ifdef BIG_PACKET
- tulip_reset(sc);
- tulip_init(sc);
+ tulip_reset(sc);
+ tulip_init(sc);
#endif
+ error = 0;
+ }
break;
#endif /* SIOCSIFMTU */
diff -r ed5d33106625 -r 0491089b012b sys/arch/alpha/alpha/ipifuncs.c
--- a/sys/arch/alpha/alpha/ipifuncs.c Mon Feb 11 14:54:36 2008 +0000
+++ b/sys/arch/alpha/alpha/ipifuncs.c Mon Feb 11 14:59:26 2008 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.33.18.2 2007/09/03 14:22:16 yamt Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.33.18.3 2008/02/11 14:59:26 yamt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.33.18.2 2007/09/03 14:22:16 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.33.18.3 2008/02/11 14:59:26 yamt Exp $");
/*
* Interprocessor interrupt handlers.
@@ -239,8 +239,6 @@
* secondary CPUs to halt, then we can drop back to the
* console.
*/
- printf("%s: waiting for secondary CPUs to halt...\n",
- ci->ci_softc->sc_dev.dv_xname);
alpha_mb();
for (;;) {
alpha_mb();
diff -r ed5d33106625 -r 0491089b012b sys/arch/alpha/alpha/linux_syscall.c
--- a/sys/arch/alpha/alpha/linux_syscall.c Mon Feb 11 14:54:36 2008 +0000
+++ b/sys/arch/alpha/alpha/linux_syscall.c Mon Feb 11 14:59:26 2008 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscall.c,v 1.14.2.5 2008/01/21 09:35:07 yamt Exp $ */
+/* $NetBSD: linux_syscall.c,v 1.14.2.6 2008/02/11 14:59:26 yamt Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.14.2.5 2008/01/21 09:35:07 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.14.2.6 2008/02/11 14:59:26 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,7 @@
args += hidden;
- if ((error = trace_enter(code, code, NULL, args)) != 0)
+ if ((error = trace_enter(code, args, callp->sy_narg)) != 0)
goto out;
rval[0] = 0;
@@ -324,7 +324,7 @@
KERNEL_UNLOCK_LAST(l);
- trace_exit(code, args, rval, error);
+ trace_exit(code, rval, error);
userret(l);
}
diff -r ed5d33106625 -r 0491089b012b sys/arch/alpha/alpha/osf1_syscall.c
--- a/sys/arch/alpha/alpha/osf1_syscall.c Mon Feb 11 14:54:36 2008 +0000
+++ b/sys/arch/alpha/alpha/osf1_syscall.c Mon Feb 11 14:59:26 2008 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index