Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/jmcneill-usbmp]: src/sys sync to latest -current.
details: https://anonhg.NetBSD.org/src/rev/41a645ca7570
branches: jmcneill-usbmp
changeset: 771846:41a645ca7570
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Apr 29 23:04:36 2012 +0000
description:
sync to latest -current.
diffstat:
sys/arch/amd64/acpi/acpi_wakecode.S | 4 +-
sys/arch/amd64/amd64/genassym.cf | 4 +-
sys/arch/amd64/amd64/locore.S | 4 +-
sys/arch/amd64/amd64/machdep.c | 26 +-
sys/arch/amd64/amd64/mptramp.S | 6 +-
sys/arch/amd64/amd64/vector.S | 4 +-
sys/arch/amd64/conf/GENERIC | 16 +-
sys/arch/amd64/conf/XEN3_DOM0 | 8 +-
sys/arch/amd64/include/param.h | 7 +-
sys/arch/amiga/amiga/autoconf.c | 6 +-
sys/arch/amiga/conf/DRACO | 6 +-
sys/arch/amiga/conf/GENERIC | 11 +-
sys/arch/amiga/conf/GENERIC.in | 9 +-
sys/arch/amiga/conf/INSTALL | 6 +-
sys/arch/amiga/conf/files.amiga | 4 +-
sys/arch/amiga/dev/if_ne_zbus.c | 17 +-
sys/arch/arm/imx/files.imx51 | 15 +-
sys/arch/arm/imx/imx31_clock.c | 4 +-
sys/arch/arm/imx/imx51_axi.c | 6 +-
sys/arch/arm/imx/imx51_ccm.c | 425 +
sys/arch/arm/imx/imx51_ccmreg.h | 199 +
sys/arch/arm/imx/imx51_ccmvar.h | 78 +
sys/arch/arm/imx/imx51_clock.c | 16 +-
sys/arch/arm/imx/imx51_dpllreg.h | 62 +
sys/arch/arm/imx/imx51_esdhc.c | 128 +
sys/arch/arm/imx/imx51_iomux.c | 16 +-
sys/arch/arm/imx/imx51_iomuxreg.h | 1003 +-
sys/arch/arm/imx/imx51_ipuv3.c | 1288 ++
sys/arch/arm/imx/imx51_ipuv3reg.h | 841 +
sys/arch/arm/imx/imx51_ipuv3var.h | 137 +
sys/arch/arm/imx/imx51reg.h | 46 +-
sys/arch/arm/imx/imxclock.c | 19 +-
sys/arch/arm/imx/imxclockvar.h | 2 +
sys/arch/arm/imx/imxepitreg.h | 14 +-
sys/arch/evbarm/conf/ADI_BRH | 6 +-
sys/arch/evbarm/conf/ARMADILLO210 | 6 +-
sys/arch/evbarm/conf/ARMADILLO9 | 6 +-
sys/arch/evbarm/conf/BEAGLEBOARD | 6 +-
sys/arch/evbarm/conf/CP3100 | 6 +-
sys/arch/evbarm/conf/GEMINI | 4 -
sys/arch/evbarm/conf/GEMINI_MASTER | 4 -
sys/arch/evbarm/conf/GEMINI_SLAVE | 4 -
sys/arch/evbarm/conf/GUMSTIX | 6 +-
sys/arch/evbarm/conf/HDL_G | 6 +-
sys/arch/evbarm/conf/IMX31LITE | 6 +-
sys/arch/evbarm/conf/INTEGRATOR | 7 +-
sys/arch/evbarm/conf/IQ31244 | 6 +-
sys/arch/evbarm/conf/IQ80310 | 6 +-
sys/arch/evbarm/conf/IQ80321 | 6 +-
sys/arch/evbarm/conf/IXDP425 | 6 +-
sys/arch/evbarm/conf/IXM1200 | 6 +-
sys/arch/evbarm/conf/LUBBOCK | 4 -
sys/arch/evbarm/conf/MMNET_GENERIC | 8 +-
sys/arch/evbarm/conf/MPCSA_GENERIC | 8 +-
sys/arch/evbarm/conf/NAPPI | 6 +-
sys/arch/evbarm/conf/NETWALKER | 43 +-
sys/arch/evbarm/conf/NETWALKER_MD | 6 +-
sys/arch/evbarm/conf/NSLU2 | 6 +-
sys/arch/evbarm/conf/OSK5912 | 4 -
sys/arch/evbarm/conf/OVERO | 6 +-
sys/arch/evbarm/conf/README.evbarm | 47 +
sys/arch/evbarm/conf/SMDK2410 | 6 +-
sys/arch/evbarm/conf/SMDK2800 | 6 +-
sys/arch/evbarm/conf/TEAMASA_NPWR | 6 +-
sys/arch/evbarm/conf/TEAMASA_NPWR_FC | 6 +-
sys/arch/evbarm/conf/TISDP2420 | 6 +-
sys/arch/evbarm/conf/TISDP2430 | 6 +-
sys/arch/evbarm/conf/TS7200 | 6 +-
sys/arch/evbarm/conf/TWINTAIL | 6 +-
sys/arch/evbarm/conf/VIPER | 6 +-
sys/arch/evbarm/conf/ZAO425 | 6 +-
sys/arch/evbarm/conf/files.netwalker | 9 +-
sys/arch/evbarm/conf/std.netwalker | 6 +-
sys/arch/evbarm/dev/plcom.c | 9 +-
sys/arch/evbarm/dev/plcomreg.h | 58 +-
sys/arch/evbarm/netwalker/netwalker_lcd.c | 268 +
sys/arch/evbarm/netwalker/netwalker_machdep.c | 308 +-
sys/arch/evbarm/netwalker/netwalker_usb.c | 34 +-
sys/arch/evbppc/obs405/rbus_machdep.c | 10 +-
sys/arch/hp700/conf/GENERIC | 5 +-
sys/arch/hp700/dev/apic.c | 76 +-
sys/arch/hp700/dev/cpu.c | 21 +-
sys/arch/hp700/dev/ssio.c | 16 +-
sys/arch/hp700/hp700/locore.S | 9 +-
sys/arch/hp700/hp700/machdep.c | 6 +-
sys/arch/hppa/hppa/fpu.c | 103 +-
sys/arch/hppa/hppa/trap.S | 53 +-
sys/arch/hppa/hppa/trap.c | 23 +-
sys/arch/i386/acpi/acpi_wakecode.S | 4 +-
sys/arch/i386/conf/ALL | 13 +-
sys/arch/i386/conf/GENERIC | 14 +-
sys/arch/i386/conf/XEN3_DOM0 | 8 +-
sys/arch/i386/i386/compat_16_machdep.c | 6 +-
sys/arch/i386/i386/genassym.cf | 4 +-
sys/arch/i386/i386/locore.S | 6 +-
sys/arch/i386/i386/mptramp.S | 8 +-
sys/arch/i386/include/param.h | 9 +-
sys/arch/ia64/conf/GENERIC | 6 +-
sys/arch/ia64/conf/GENERIC.SKI | 6 +-
sys/arch/powerpc/booke/dev/pq3etsec.c | 6 +-
sys/arch/powerpc/include/cpu.h | 6 +-
sys/arch/sandpoint/conf/GENERIC | 5 +-
sys/arch/sandpoint/sandpoint/satmgr.c | 111 +-
sys/arch/sandpoint/stand/altboot/README.altboot | 19 +-
sys/arch/sandpoint/stand/altboot/brdsetup.c | 99 +-
sys/arch/sandpoint/stand/altboot/dsk.c | 78 +-
sys/arch/sandpoint/stand/altboot/globals.h | 40 +-
sys/arch/sandpoint/stand/altboot/main.c | 185 +-
sys/arch/sparc/sparc/intr.c | 12 +-
sys/arch/sparc/sparc/machdep.c | 6 +-
sys/arch/sparc64/dev/ffb.c | 12 +-
sys/arch/sparc64/dev/gfb.c | 16 +-
sys/arch/sparc64/sparc64/trap.c | 10 +-
sys/arch/x68k/conf/GENERIC | 8 +-
sys/arch/x68k/conf/INSTALL | 8 +-
sys/arch/x68k/conf/files.x68k | 9 +-
sys/arch/x68k/conf/majors.x68k | 4 +-
sys/arch/x68k/dev/com.c | 1188 -
sys/arch/x68k/dev/com_intio.c | 130 +
sys/arch/x68k/dev/comreg.h | 44 -
sys/arch/x68k/stand/Makefile | 7 +-
sys/arch/x68k/stand/mboot/mboot.c | 18 +-
sys/arch/x68k/x68k/autoconf.c | 5 +-
sys/arch/x68k/x68k/locore.s | 31 +-
sys/arch/x68k/x68k/vectors.s | 6 +-
sys/arch/x86/acpi/acpi_wakeup.c | 56 +-
sys/arch/x86/include/cpu.h | 6 +-
sys/arch/x86/include/cpuvar.h | 6 +-
sys/arch/x86/include/pmap.h | 11 +-
sys/arch/x86/include/psl.h | 4 +-
sys/arch/x86/include/specialreg.h | 5 +-
sys/arch/x86/pci/amdnb_misc.c | 171 +
sys/arch/x86/pci/amdtemp.c | 25 +-
sys/arch/x86/pci/files.pci | 13 +-
sys/arch/x86/pci/pchb.c | 54 +-
sys/arch/x86/pci/pchbvar.h | 6 +-
sys/arch/x86/pci/pcib.c | 13 +-
sys/arch/x86/x86/cpu.c | 33 +-
sys/arch/x86/x86/errata.c | 23 +-
sys/arch/x86/x86/mtrr_i686.c | 59 +-
sys/arch/x86/x86/pmap.c | 175 +-
sys/arch/x86/x86/pmap_tlb.c | 231 +-
sys/arch/xen/include/xenpmap.h | 11 +-
sys/arch/xen/x86/cpu.c | 30 +-
sys/arch/xen/x86/x86_xpmap.c | 38 +-
sys/arch/xen/x86/xen_pmap.c | 12 +-
sys/arch/xen/xen/hypervisor.c | 11 +-
sys/arch/zaurus/conf/GENERIC | 4 +-
sys/arch/zaurus/conf/INSTALL | 4 +-
sys/coda/coda_psdev.c | 49 +-
sys/coda/coda_subr.c | 10 +-
sys/coda/coda_venus.c | 6 +-
sys/coda/coda_vfsops.c | 11 +-
sys/coda/coda_vnops.c | 320 +-
sys/coda/coda_vnops.h | 13 +-
sys/compat/netbsd32/netbsd32.h | 28 +-
sys/compat/netbsd32/netbsd32_execve.c | 145 +-
sys/compat/netbsd32/netbsd32_syscall.h | 9 +-
sys/compat/netbsd32/netbsd32_syscallargs.h | 16 +-
sys/compat/netbsd32/netbsd32_syscalls.c | 8 +-
sys/compat/netbsd32/netbsd32_sysent.c | 10 +-
sys/compat/netbsd32/syscalls.master | 9 +-
sys/conf/files | 9 +-
sys/ddb/db_command.c | 23 +-
sys/dev/DEVNAMES | 14 +-
sys/dev/acpi/acpi.c | 24 +-
sys/dev/acpi/acpi_cpu.h | 3 +-
sys/dev/acpi/acpi_cpu_tstate.c | 12 +-
sys/dev/acpi/acpica/OsdMemory.c | 13 +-
sys/dev/ata/ata.c | 8 +-
sys/dev/audio.c | 28 +-
sys/dev/cardbus/files.cardbus | 8 +-
sys/dev/cardbus/if_bwi_cardbus.c | 275 +
sys/dev/dkwedge/dk.c | 9 +-
sys/dev/dkwedge/dkwedge_apple.c | 222 +
sys/dev/dkwedge/dkwedge_mbr.c | 15 +-
sys/dev/i2c/dbcool.c | 14 +-
sys/dev/i2c/i2c_exec.c | 8 +-
sys/dev/i2c/i2c_io.h | 26 +-
sys/dev/ic/ahcisata_core.c | 5 +-
sys/dev/ic/bwi.c | 49 +-
sys/dev/ic/bwivar.h | 6 +-
sys/dev/ic/com.c | 11 +-
sys/dev/ic/mvsata.c | 5 +-
sys/dev/ic/opl.c | 15 +-
sys/dev/ic/oplvar.h | 4 +-
sys/dev/ic/siisata.c | 7 +-
sys/dev/ieee1394/firewire.c | 11 +-
sys/dev/ieee1394/firewirereg.h | 3 +-
sys/dev/ieee1394/fwdev.c | 10 +-
sys/dev/ieee1394/fwmem.c | 12 +-
sys/dev/ieee1394/fwohcivar.h | 4 +-
sys/dev/ieee1394/if_fwip.c | 13 +-
sys/dev/isa/cms.c | 20 +-
sys/dev/isa/midi_pcppi.c | 16 +-
sys/dev/isa/opl_ess.c | 6 +-
sys/dev/isa/opl_isa.c | 6 +-
sys/dev/isa/opl_sb.c | 6 +-
sys/dev/isa/opl_wss.c | 6 +-
sys/dev/isa/opl_ym.c | 6 +-
sys/dev/isa/pcppi.c | 10 +-
sys/dev/isa/spkr.c | 8 +-
sys/dev/midi.c | 16 +-
sys/dev/midi_if.h | 4 +-
sys/dev/midisyn.c | 19 +-
sys/dev/midisynvar.h | 6 +-
sys/dev/mii/miidevs | 5 +-
sys/dev/mii/miidevs.h | 8 +-
sys/dev/mii/miidevs_data.h | 5 +-
sys/dev/pci/agp.c | 11 +-
sys/dev/pci/files.pci | 7 +-
sys/dev/pci/if_bnxvar.h | 4 +-
sys/dev/pci/mpii.c | 5536 ++++++++
sys/dev/pci/opl_cmpci.c | 6 +-
sys/dev/pci/opl_eso.c | 6 +-
sys/dev/pci/opl_fms.c | 6 +-
sys/dev/pci/opl_sv.c | 6 +-
sys/dev/pci/opl_yds.c | 6 +-
sys/dev/pci/pci_subr.c | 15 +-
sys/dev/pci/pcidevs | 59 +-
sys/dev/pci/pcidevs.h | 61 +-
sys/dev/pci/pcidevs_data.h | 13596 +++++++++++----------
sys/dev/pci/r128fb.c | 66 +-
sys/dev/pci/radeonfb.c | 30 +-
sys/dev/pci/slide.c | 10 +-
sys/dev/pci/voodoofb.c | 6 +-
sys/dev/pci/voyager/voyagerfb.c | 17 +-
sys/dev/raidframe/rf_netbsdkintf.c | 13 +-
sys/dev/rasops/rasops.c | 48 +-
sys/dev/rasops/rasops.h | 4 +-
sys/dev/rasops/rasops15.c | 8 +-
sys/dev/rndpseudo.c | 50 +-
sys/dev/scsipi/atapi_wdc.c | 5 +-
sys/dev/scsipi/atapiconf.c | 13 +-
sys/dev/scsipi/cd.c | 10 +-
sys/dev/scsipi/scsi_base.c | 147 +-
sys/dev/scsipi/scsiconf.c | 39 +-
sys/dev/scsipi/scsiconf.h | 13 +-
sys/dev/scsipi/scsipi_base.c | 118 +-
sys/dev/scsipi/scsipi_ioctl.c | 8 +-
sys/dev/scsipi/scsipiconf.h | 17 +-
sys/dev/scsipi/sd.c | 13 +-
sys/dev/scsipi/st.c | 10 +-
sys/dev/scsipi/st_atapi.c | 7 +-
sys/dev/scsipi/st_scsi.c | 7 +-
sys/dev/sequencer.c | 5 +-
sys/dev/sun/files.sun | 4 +-
sys/dev/sun/kbd.c | 61 +-
sys/dev/sun/kbdvar.h | 6 +-
sys/dev/usb/uaudio.c | 10 +-
sys/dev/usb/ubt.c | 23 +-
sys/dev/usb/ugen.c | 5 +-
sys/dev/usb/ukbd.c | 60 +-
sys/dev/usb/umass_scsipi.c | 8 +-
sys/dev/usb/usbdevs | 12 +-
sys/dev/usb/usbdevs.h | 14 +-
sys/dev/usb/usbdevs_data.h | 32 +-
sys/dev/usb/usbdi.h | 4 +-
sys/dev/wscons/wsconsio.h | 3 +-
sys/dev/wscons/wsdisplay_glyphcache.c | 9 +-
sys/dev/wscons/wsdisplay_glyphcachevar.h | 6 +-
sys/dev/wscons/wsksymdef.h | 3 +-
sys/dev/wsfb/genfb.c | 28 +-
sys/dev/wsfont/Droid_Sans_Mono_12x22.h | 16 +
sys/dev/wsfont/Droid_Sans_Mono_9x18.h | 16 +
sys/external/isc/atheros_hal/ic/ah_osdep.c | 23 +-
sys/fs/msdosfs/msdosfs_fat.c | 29 +-
sys/fs/puffs/puffs_msgif.h | 23 +-
sys/fs/puffs/puffs_node.c | 7 +-
sys/fs/puffs/puffs_sys.h | 9 +-
sys/fs/puffs/puffs_vfsops.c | 7 +-
sys/fs/puffs/puffs_vnops.c | 285 +-
sys/kern/exec_elf.c | 7 +-
sys/kern/init_sysctl.c | 7 +-
sys/kern/kern_exec.c | 404 +-
sys/kern/kern_exit.c | 13 +-
sys/kern/kern_lwp.c | 6 +-
sys/kern/kern_malloc.c | 244 +-
sys/kern/kern_malloc_debug.c | 327 -
sys/kern/kern_malloc_stdtype.c | 58 -
sys/kern/kern_proc.c | 9 +-
sys/kern/kern_rndpool.c | 12 +-
sys/kern/kern_rndq.c | 44 +-
sys/kern/kern_synch.c | 11 +-
sys/kern/subr_cprng.c | 111 +-
sys/kern/subr_disk_open.c | 26 +-
sys/kern/subr_kcpuset.c | 31 +-
sys/kern/subr_kmem.c | 11 +-
sys/kern/subr_pcu.c | 31 +-
sys/kern/sys_sched.c | 31 +-
sys/kern/uipc_mbuf.c | 5 +-
sys/kern/vfs_syscalls.c | 28 +-
sys/lib/libkern/arc4random.c | 7 +-
sys/modules/Makefile | 6 +-
sys/modules/amdtemp/amdtemp.ioconf | 6 +-
sys/modules/chfs/Makefile | 4 +-
sys/modules/coda/Makefile | 5 +-
sys/net/npf/npf.h | 8 +-
sys/net/npf/npf_impl.h | 8 +-
sys/net/npf/npf_mbuf.c | 8 +-
sys/net/npf/npf_ncode.h | 4 +-
sys/netinet/rfc6056.c | 9 +-
sys/netinet/tcp_input.c | 10 +-
sys/netinet/tcp_vtw.c | 50 +-
sys/nfs/nfs_vnops.c | 9 +-
sys/rump/dev/lib/libdrvctl/component.c | 6 +-
sys/rump/dev/lib/libmd/component.c | 6 +-
sys/rump/dev/lib/libnpf/Makefile | 13 +-
sys/rump/librump/rumpkern/Makefile.rumpkern | 3 +-
sys/rump/librump/rumpkern/locks_up.c | 5 +-
sys/rump/librump/rumpkern/memalloc.c | 10 +-
sys/rump/net/lib/libnet/Makefile | 4 +-
sys/sys/cprng.h | 4 +-
sys/sys/debug.h | 4 +-
sys/sys/exec.h | 11 +-
sys/sys/kcpuset.h | 3 +-
sys/sys/malloc.h | 51 +-
sys/sys/mallocvar.h | 3 +-
sys/sys/mbuf.h | 23 +-
sys/sys/param.h | 4 +-
sys/sys/pcu.h | 16 +-
sys/sys/rnd.h | 12 +-
sys/sys/spawn.h | 23 +-
sys/ufs/chfs/chfs.h | 27 +-
sys/ufs/chfs/chfs_build.c | 6 +-
sys/ufs/chfs/chfs_inode.h | 36 +-
sys/ufs/chfs/chfs_subr.c | 34 +-
sys/ufs/chfs/chfs_vfsops.c | 28 +-
sys/ufs/chfs/chfs_vnode.c | 12 +-
sys/ufs/chfs/chfs_vnops.c | 32 +-
sys/ufs/chfs/chfs_write.c | 8 +-
sys/ufs/chfs/debug.c | 48 -
sys/ufs/chfs/debug.h | 15 +-
sys/ufs/chfs/ebh.h | 41 +-
sys/ufs/ext2fs/ext2fs_readwrite.c | 14 +-
sys/ufs/ffs/fs.h | 8 +-
sys/ufs/files.ufs | 3 +-
sys/ufs/ufs/ufs_readwrite.c | 14 +-
sys/uvm/uvm_amap.c | 26 +-
sys/uvm/uvm_emap.c | 38 +-
sys/uvm/uvm_extern.h | 3 +-
sys/uvm/uvm_glue.c | 21 +-
sys/uvm/uvm_km.c | 6 +-
sys/uvm/uvm_map.c | 40 +-
344 files changed, 21042 insertions(+), 12396 deletions(-)
diffs (truncated from 47905 to 300 lines):
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/acpi/acpi_wakecode.S
--- a/sys/arch/amd64/acpi/acpi_wakecode.S Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/acpi/acpi_wakecode.S Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakecode.S,v 1.10 2009/08/24 22:06:50 jmcneill Exp $ */
+/* $NetBSD: acpi_wakecode.S,v 1.10.16.1 2012/04/29 23:04:36 mrg Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <joerg%netbsd.org@localhost>
@@ -198,7 +198,7 @@
/* Enable paging */
movl %cr0,%eax
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP|CR0_AM),%eax
movl %eax,%cr0
/* Flush prefetch queue */
jmp 1f
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/amd64/genassym.cf
--- a/sys/arch/amd64/amd64/genassym.cf Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/amd64/genassym.cf Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.48.6.1 2012/02/18 07:31:09 mrg Exp $
+# $NetBSD: genassym.cf,v 1.48.6.2 2012/04/29 23:04:36 mrg Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -228,12 +228,10 @@
define CPU_INFO_WANT_PMAPLOAD offsetof(struct cpu_info, ci_want_pmapload)
define CPU_INFO_TLBSTATE offsetof(struct cpu_info, ci_tlbstate)
define TLBSTATE_VALID TLBSTATE_VALID
-define CPU_INFO_TLB_EVCNT offsetof(struct cpu_info, ci_tlb_evcnt)
define CPU_INFO_CURLWP offsetof(struct cpu_info, ci_curlwp)
define CPU_INFO_CURLDT offsetof(struct cpu_info, ci_curldt)
define CPU_INFO_IDLELWP offsetof(struct cpu_info, ci_data.cpu_idlelwp)
define CPU_INFO_PMAP offsetof(struct cpu_info, ci_pmap)
-define CPU_INFO_CPUMASK offsetof(struct cpu_info, ci_cpumask)
define CPU_INFO_RSP0 offsetof(struct cpu_info, ci_tss.tss_rsp0)
define CPU_INFO_NSYSCALL offsetof(struct cpu_info, ci_data.cpu_nsyscall)
define CPU_INFO_NTRAP offsetof(struct cpu_info, ci_data.cpu_ntrap)
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/amd64/locore.S Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.65.8.2 2012/03/04 00:46:02 mrg Exp $ */
+/* $NetBSD: locore.S,v 1.65.8.3 2012/04/29 23:04:36 mrg Exp $ */
/*
* Copyright-o-rama!
@@ -626,7 +626,7 @@
* 4. Enable paging and the rest of it.
*/
movl %cr0,%eax
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP|CR0_AM),%eax
movl %eax,%cr0
jmp compat
compat:
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/amd64/machdep.c Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.171.2.5 2012/03/06 18:26:34 mrg Exp $ */
+/* $NetBSD: machdep.c,v 1.171.2.6 2012/04/29 23:04:36 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.171.2.5 2012/03/06 18:26:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.171.2.6 2012/04/29 23:04:36 mrg Exp $");
/* #define XENDEBUG_LOW */
@@ -2071,6 +2071,7 @@
uint16_t sel;
int error;
struct pmap *pmap = l->l_proc->p_vmspace->vm_map.pmap;
+ struct proc *p = l->l_proc;
gr = mcp->__gregs;
@@ -2104,33 +2105,42 @@
return error;
#endif
} else {
+#define VUD(sel) \
+ ((p->p_flag & PK_32) ? VALID_USER_DSEL32(sel) : VALID_USER_DSEL(sel))
sel = gr[_REG_ES] & 0xffff;
- if (sel != 0 && !VALID_USER_DSEL(sel))
+ if (sel != 0 && !VUD(sel))
return EINVAL;
+/* XXX: Shouldn't this be FSEL32? */
+#define VUF(sel) \
+ ((p->p_flag & PK_32) ? VALID_USER_DSEL32(sel) : VALID_USER_DSEL(sel))
sel = gr[_REG_FS] & 0xffff;
- if (sel != 0 && !VALID_USER_DSEL(sel))
+ if (sel != 0 && !VUF(sel))
return EINVAL;
+#define VUG(sel) \
+ ((p->p_flag & PK_32) ? VALID_USER_GSEL32(sel) : VALID_USER_DSEL(sel))
sel = gr[_REG_GS] & 0xffff;
- if (sel != 0 && !VALID_USER_DSEL(sel))
+ if (sel != 0 && !VUG(sel))
return EINVAL;
sel = gr[_REG_DS] & 0xffff;
- if (!VALID_USER_DSEL(sel))
+ if (!VUD(sel))
return EINVAL;
#ifndef XEN
sel = gr[_REG_SS] & 0xffff;
- if (!VALID_USER_DSEL(sel))
+ if (!VUD(sel))
return EINVAL;
#endif
}
#ifndef XEN
+#define VUC(sel) \
+ ((p->p_flag & PK_32) ? VALID_USER_CSEL32(sel) : VALID_USER_CSEL(sel))
sel = gr[_REG_CS] & 0xffff;
- if (!VALID_USER_CSEL(sel))
+ if (!VUC(sel))
return EINVAL;
#endif
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/amd64/mptramp.S
--- a/sys/arch/amd64/amd64/mptramp.S Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/amd64/mptramp.S Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mptramp.S,v 1.12 2010/04/20 15:42:21 jym Exp $ */
+/* $NetBSD: mptramp.S,v 1.12.12.1 2012/04/29 23:04:36 mrg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -108,7 +108,6 @@
#define HALTT(x,y) /**/
#endif
- .globl _C_LABEL(idle_loop)
.global _C_LABEL(cpu_spinup_trampoline)
.global _C_LABEL(cpu_spinup_trampoline_end)
.global _C_LABEL(cpu_hatch)
@@ -173,7 +172,7 @@
movl %ecx,%cr3 # load ptd addr into mmu
movl %cr0,%eax # get control word
- orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP),%eax
+ orl $(CR0_PE|CR0_PG|CR0_NE|CR0_TS|CR0_MP|CR0_WP|CR0_AM),%eax
movl %eax,%cr0
jmp mptramp_compat
mptramp_compat:
@@ -252,7 +251,6 @@
movl PCB_CR0(%rsi),%eax
movq %rax,%cr0
call _C_LABEL(cpu_hatch)
- jmp _C_LABEL(idle_loop)
.data
_C_LABEL(mp_pdirpa):
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/amd64/vector.S
--- a/sys/arch/amd64/amd64/vector.S Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/amd64/vector.S Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.38 2011/06/12 03:35:38 rmind Exp $ */
+/* $NetBSD: vector.S,v 1.38.6.1 2012/04/29 23:04:36 mrg Exp $ */
/*-
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -228,7 +228,7 @@
STI(si)
jmp calltrap
IDTVEC(trap11)
- ZTRAP(T_ALIGNFLT)
+ TRAP(T_ALIGNFLT)
IDTVEC(trap12)
ZTRAP(T_MCA)
IDTVEC(trap13)
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/conf/GENERIC Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.340.2.6 2012/04/05 21:33:11 mrg Exp $
+# $NetBSD: GENERIC,v 1.340.2.7 2012/04/29 23:04:37 mrg Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.340.2.6 $"
+#ident "GENERIC-$Revision: 1.340.2.7 $"
maxusers 64 # estimated number of users
@@ -127,9 +127,11 @@
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
-# The following two options can break /etc/fstab, so handle with care
+# The following three options can break /etc/fstab, so handle with care
#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
+#options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
+
file-system FFS # UFS
file-system MFS # memory file system
@@ -438,7 +440,8 @@
# Hardware monitors
-amdtemp* at pchb? # AMD CPU Temperature sensors
+amdnb_misc* at pci? # AMD NB Misc Configuration
+amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
@@ -543,7 +546,8 @@
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi* at pci? dev ? function ? # LSI MegaRAID SAS
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
-mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030
+mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT)
+mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
esiop* at pci? dev ? function ? # Symbios 53c875 and newer SCSI
@@ -1197,7 +1201,7 @@
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
+options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
#
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0 Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0 Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.75.2.3 2012/03/11 01:52:18 mrg Exp $
+# $NetBSD: XEN3_DOM0,v 1.75.2.4 2012/04/29 23:04:37 mrg Exp $
include "arch/amd64/conf/std.xen"
@@ -296,7 +296,8 @@
# Hardware monitors
-amdtemp* at pchb? # AMD CPU Temperature sensors
+amdnb_misc* at pci? # AMD NB Misc Configuration
+amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
@@ -486,7 +487,8 @@
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi* at pci? dev ? function ? # LSI MegaRAID SAS
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
-mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC
+mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT)
+mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II
njs* at pci? dev ? function ? # Workbit NinjaSCSI-32
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amd64/include/param.h
--- a/sys/arch/amd64/include/param.h Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amd64/include/param.h Sun Apr 29 23:04:36 2012 +0000
@@ -1,7 +1,12 @@
-/* $NetBSD: param.h,v 1.14.6.1 2012/02/18 07:31:12 mrg Exp $ */
+/* $NetBSD: param.h,v 1.14.6.2 2012/04/29 23:04:37 mrg Exp $ */
#ifdef __x86_64__
+#ifndef XEN
+/* Must be defined before cpu.h */
+#define MAXCPUS 256
+#endif
+
#ifdef _KERNEL
#include <machine/cpu.h>
#endif
diff -r 4c01aabae4e3 -r 41a645ca7570 sys/arch/amiga/amiga/autoconf.c
--- a/sys/arch/amiga/amiga/autoconf.c Tue Apr 17 19:25:17 2012 +0000
+++ b/sys/arch/amiga/amiga/autoconf.c Sun Apr 29 23:04:36 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.108.6.1 2012/02/18 07:31:12 mrg Exp $ */
+/* $NetBSD: autoconf.c,v 1.108.6.2 2012/04/29 23:04:37 mrg Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
Home |
Main Index |
Thread Index |
Old Index