PERFORCE change 51807 for review
Warner Losh
imp at FreeBSD.org
Tue Apr 27 12:06:49 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=51807
Change 51807 by imp at imp_pacopaco on 2004/04/27 12:06:24
IFC @51805
Affected files ...
.. //depot/projects/power/sys/alpha/alpha/pmap.c#7 integrate
.. //depot/projects/power/sys/boot/i386/boot0/Makefile#5 integrate
.. //depot/projects/power/sys/boot/i386/btx/btx/Makefile#3 integrate
.. //depot/projects/power/sys/boot/i386/btx/btxldr/Makefile#3 integrate
.. //depot/projects/power/sys/boot/i386/cdboot/Makefile#3 integrate
.. //depot/projects/power/sys/boot/i386/mbr/Makefile#3 integrate
.. //depot/projects/power/sys/boot/i386/pxeldr/Makefile#3 integrate
.. //depot/projects/power/sys/conf/NOTES#15 integrate
.. //depot/projects/power/sys/conf/kern.pre.mk#7 integrate
.. //depot/projects/power/sys/conf/options#15 integrate
.. //depot/projects/power/sys/dev/acpica/acpi.c#21 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_pci.c#14 integrate
.. //depot/projects/power/sys/dev/ata/ata-lowlevel.c#9 integrate
.. //depot/projects/power/sys/dev/ata/ata-pci.c#10 integrate
.. //depot/projects/power/sys/dev/ciss/ciss.c#9 integrate
.. //depot/projects/power/sys/dev/cy/cy.c#1 branch
.. //depot/projects/power/sys/dev/cy/cy_isa.c#1 branch
.. //depot/projects/power/sys/dev/cy/cy_pci.c#1 branch
.. //depot/projects/power/sys/dev/cy/cyreg.h#1 branch
.. //depot/projects/power/sys/dev/ic/cd1400.h#1 branch
.. //depot/projects/power/sys/dev/led/led.c#5 integrate
.. //depot/projects/power/sys/dev/pci/pci.c#15 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs.h#10 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs_data.h#10 integrate
.. //depot/projects/power/sys/i386/conf/GENERIC#9 integrate
.. //depot/projects/power/sys/i386/i386/elan-mmcr.c#8 integrate
.. //depot/projects/power/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/power/sys/kern/vfs_syscalls.c#9 integrate
.. //depot/projects/power/sys/modules/Makefile#9 integrate
.. //depot/projects/power/sys/net/rtsock.c#8 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#3 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#3 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#3 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket.c#4 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate
.. //depot/projects/power/sys/netgraph/ng_pptpgre.c#3 integrate
.. //depot/projects/power/sys/netgraph/ng_pptpgre.h#3 integrate
.. //depot/projects/power/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/power/sys/netinet/tcp_input.c#11 integrate
.. //depot/projects/power/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/power/sys/netinet6/nd6.c#10 integrate
.. //depot/projects/power/sys/sys/jail.h#3 integrate
.. //depot/projects/power/sys/sys/mman.h#3 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_vfsops.c#7 integrate
Differences ...
==== //depot/projects/power/sys/alpha/alpha/pmap.c#7 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.144 2004/04/24 20:53:54 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1074,7 +1074,7 @@
*/
VM_OBJECT_LOCK(pmap->pm_pteobj);
lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS,
- VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED);
+ VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO);
vm_page_lock_queues();
vm_page_flag_clear(lev1pg, PG_BUSY);
@@ -1083,9 +1083,6 @@
VM_OBJECT_UNLOCK(pmap->pm_pteobj);
pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg));
- if ((lev1pg->flags & PG_ZERO) == 0)
- bzero(pmap->pm_lev1, PAGE_SIZE);
-
/* install self-referential address mapping entry (not PG_ASM) */
pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg))
@@ -1903,7 +1900,8 @@
* raise IPL while manipulating pv_table since pmap_enter can be
* called at interrupt time.
*/
- if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) {
+ if (pmap_initialized &&
+ (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
pmap_insert_entry(pmap, va, mpte, m);
managed |= PG_MANAGED;
}
@@ -1963,7 +1961,7 @@
pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte)
{
register pt_entry_t *pte;
-
+ int managed;
/*
* In the case that a page table page is not
@@ -2028,7 +2026,11 @@
* raise IPL while manipulating pv_table since pmap_enter can be
* called at interrupt time.
*/
- pmap_insert_entry(pmap, va, mpte, m);
+ managed = 0;
+ if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) {
+ pmap_insert_entry(pmap, va, mpte, m);
+ managed = PG_MANAGED | PG_FOR | PG_FOW | PG_FOE;
+ }
/*
* Increment counters
@@ -2038,7 +2040,7 @@
/*
* Now validate mapping with RO protection
*/
- *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | PG_MANAGED | PG_FOR | PG_FOE | PG_FOW;
+ *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed;
alpha_pal_imb(); /* XXX overkill? */
return mpte;
==== //depot/projects/power/sys/boot/i386/boot0/Makefile#5 (text+ko) ====
@@ -1,11 +1,10 @@
-# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.23 2004/02/09 14:11:56 ru Exp $
+# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.25 2004/04/25 20:36:43 obrien Exp $
-PROG= ${BOOT}.out
+PROG= ${BOOT}
INTERNALPROG=
FILES= ${BOOT}
NOMAN=
SRCS= ${BOOT}.s
-CLEANFILES= ${BOOT}
BOOT?= boot0
@@ -34,9 +33,6 @@
--defsym TICKS=${BOOT_BOOT0_TICKS} \
--defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED}
-LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG}
-
-${BOOT}: ${BOOT}.out
- objcopy -S -O binary ${BOOT}.out ${.TARGET}
+LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary
.include <bsd.prog.mk>
==== //depot/projects/power/sys/boot/i386/btx/btx/Makefile#3 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.15 2004/02/11 08:42:37 ru Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.17 2004/04/25 20:36:43 obrien Exp $
-PROG= btx.out
+PROG= btx
INTERNALPROG=
NOMAN=
SRCS= btx.S
@@ -29,11 +29,6 @@
ORG= 0x9000
-all: btx
-
-LDFLAGS=-N -e start -Ttext ${ORG}
-
-btx: btx.out
- objcopy -S -O binary btx.out ${.TARGET}
+LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
.include <bsd.prog.mk>
==== //depot/projects/power/sys/boot/i386/btx/btxldr/Makefile#3 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.14 2004/02/11 08:42:37 ru Exp $
+# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.16 2004/04/25 20:36:44 obrien Exp $
-PROG= btxldr.out
+PROG= btxldr
INTERNALPROG=
NOMAN=
SRCS= btxldr.S
@@ -12,11 +12,6 @@
CFLAGS+=-DBTXLDR_VERBOSE
.endif
-all: btxldr
-
-LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS}
-
-btxldr: btxldr.out
- objcopy -S -O binary btxldr.out ${.TARGET}
+LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS} -Wl,-S,--oformat,binary
.include <bsd.prog.mk>
==== //depot/projects/power/sys/boot/i386/cdboot/Makefile#3 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.8 2004/02/09 14:11:57 ru Exp $
+# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.10 2004/04/25 20:36:44 obrien Exp $
-PROG= ${BOOT}.out
+PROG= ${BOOT}
INTERNALPROG=
FILES= ${BOOT}
NOMAN=
@@ -10,9 +10,6 @@
BOOT= cdboot
ORG= 0x7c00
-${BOOT}: ${BOOT}.out
- objcopy -S -O binary ${BOOT}.out ${.TARGET}
-
-LDFLAGS=-N -e start -Ttext ${ORG}
+LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
.include <bsd.prog.mk>
==== //depot/projects/power/sys/boot/i386/mbr/Makefile#3 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.9 2004/02/09 14:11:57 ru Exp $
+# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.11 2004/04/25 20:36:44 obrien Exp $
-PROG= ${BOOT}.out
+PROG= ${BOOT}
INTERNALPROG=
FILES= ${BOOT}
NOMAN=
@@ -10,9 +10,6 @@
BOOT= mbr
ORG= 0x600
-${BOOT}: ${BOOT}.out
- objcopy -S -O binary ${BOOT}.out ${.TARGET}
-
-LDFLAGS=-N -e start -Ttext ${ORG}
+LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
.include <bsd.prog.mk>
==== //depot/projects/power/sys/boot/i386/pxeldr/Makefile#3 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.13 2004/02/11 08:42:38 ru Exp $
+# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.15 2004/04/25 20:36:44 obrien Exp $
# Pick up ../Makefile.inc early.
.include <bsd.init.mk>
-PROG= ${LDR}.out
+PROG= ${LDR}
INTERNALPROG=
FILES= ${BOOT}
MAN= ${BOOT}.8
@@ -34,10 +34,7 @@
CLEANFILES+= ${LDR}
-${LDR}: ${LDR}.out
- objcopy -S -O binary ${LDR}.out ${.TARGET}
-
-LDFLAGS+= -N -e start -Ttext ${ORG}
+LDFLAGS+= -N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary
CLEANFILES+= ${LOADER}
==== //depot/projects/power/sys/conf/NOTES#15 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1221 2004/04/24 22:03:01 rik Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1222 2004/04/27 16:38:12 emax Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -410,6 +410,15 @@
options NETGRAPH #netgraph(4) system
options NETGRAPH_ASYNC
options NETGRAPH_ATMLLC
+options NETGRAPH_ATM_ATMPIF
+options NETGRAPH_BLUETOOTH # ng_bluetooth(4)
+options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4)
+options NETGRAPH_BLUETOOTH_H4 # ng_h4(4)
+options NETGRAPH_BLUETOOTH_HCI # ng_hci(4)
+options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4)
+options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4)
+options NETGRAPH_BLUETOOTH_UBT # ng_ubt(4)
+options NETGRAPH_BLUETOOTH_UBTBCMFW # ubtbcmfw(4)
options NETGRAPH_BPF
options NETGRAPH_BRIDGE
options NETGRAPH_CISCO
@@ -439,17 +448,6 @@
options NETGRAPH_TTY
options NETGRAPH_UI
options NETGRAPH_VJC
-options NETGRAPH_ATM_ATMPIF
-
-# NgBluetooth - Netgraph Bluetooth
-options NETGRAPH_BLUETOOTH # Common parts
-options NETGRAPH_BLUETOOTH_BT3C # 3COM Bluetooth PCCARD
-options NETGRAPH_BLUETOOTH_H4 # H4 line discipline
-options NETGRAPH_BLUETOOTH_UBT # Bluetooth USB dongle
-options NETGRAPH_BLUETOOTH_UBTBCMFW # Firmware driver for BCM2033
-options NETGRAPH_BLUETOOTH_HCI # Bluetooth HCI layer
-options NETGRAPH_BLUETOOTH_L2CAP # Bluetooth L2CAP layer
-options NETGRAPH_BLUETOOTH_SOCKET # Bluetooth sockets layer
# NgATM - Netgraph ATM
options NGATM_ATM
==== //depot/projects/power/sys/conf/kern.pre.mk#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.51 2004/04/23 19:48:43 emax Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.52 2004/04/27 16:38:13 emax Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -63,15 +63,6 @@
# ... and the same for the NgATM stuff
INCLUDES+= -I$S/contrib/ngatm
-# ... and the same for the NgBluetooth stuff
-INCLUDES+= -I$S/netgraph/bluetooth/include
-INCLUDES+= -I$S/netgraph/bluetooth/drivers/bt3c
-INCLUDES+= -I$S/netgraph/bluetooth/drivers/h4
-INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubt
-INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubtbcmfw
-INCLUDES+= -I$S/netgraph/bluetooth/hci
-INCLUDES+= -I$S/netgraph/bluetooth/l2cap
-
COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
.if ${CC} != "icc"
==== //depot/projects/power/sys/conf/options#15 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.444 2004/04/24 22:03:02 rik Exp $
+# $FreeBSD: src/sys/conf/options,v 1.445 2004/04/27 16:38:13 emax Exp $
#
# On the handling of kernel options
#
@@ -351,6 +351,15 @@
NETGRAPH
NETGRAPH_ASYNC opt_netgraph.h
NETGRAPH_ATMLLC opt_netgraph.h
+NETGRAPH_ATM_ATMPIF opt_netgraph.h
+NETGRAPH_BLUETOOTH opt_netgraph.h
+NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h
+NETGRAPH_BLUETOOTH_H4 opt_netgraph.h
+NETGRAPH_BLUETOOTH_HCI opt_netgraph.h
+NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h
+NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h
+NETGRAPH_BLUETOOTH_UBT opt_netgraph.h
+NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h
NETGRAPH_BPF opt_netgraph.h
NETGRAPH_BRIDGE opt_netgraph.h
NETGRAPH_CISCO opt_netgraph.h
@@ -380,17 +389,6 @@
NETGRAPH_TTY opt_netgraph.h
NETGRAPH_UI opt_netgraph.h
NETGRAPH_VJC opt_netgraph.h
-NETGRAPH_ATM_ATMPIF opt_netgraph.h
-
-# NgBluetooth options
-NETGRAPH_BLUETOOTH opt_netgraph.h
-NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h
-NETGRAPH_BLUETOOTH_H4 opt_netgraph.h
-NETGRAPH_BLUETOOTH_UBT opt_netgraph.h
-NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h
-NETGRAPH_BLUETOOTH_HCI opt_netgraph.h
-NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h
-NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h
# NgATM options
NGATM_ATM opt_netgraph.h
==== //depot/projects/power/sys/dev/acpica/acpi.c#21 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.141 2004/04/21 00:38:54 njl Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.143 2004/04/26 08:49:11 takawata Exp $
*/
#include "opt_acpi.h"
@@ -1159,7 +1159,7 @@
static void
acpi_shutdown_final(void *arg, int howto)
{
-
+ ACPI_STATUS status;
ACPI_ASSERTLOCK;
/*
@@ -1168,6 +1168,12 @@
* not power off the system correctly if called from an AP.
*/
if ((howto & RB_POWEROFF) != 0) {
+ status = AcpiEnterSleepStatePrep(ACPI_STATE_S5);
+ if (ACPI_FAILURE(status)) {
+ printf("AcpiEnterSleepStatePrep failed - %s\n",
+ AcpiFormatException(status));
+ return;
+ }
printf("Powering system off using ACPI\n");
smp_rendezvous(NULL, acpi_shutdown_poweroff, NULL, NULL);
} else {
@@ -1176,6 +1182,10 @@
}
}
+/*
+ * Since this function may be called with locks held or in an unknown
+ * context, it cannot allocate memory, acquire locks, sleep, etc.
+ */
static void
acpi_shutdown_poweroff(void *arg)
{
@@ -1187,12 +1197,6 @@
if (PCPU_GET(cpuid) != 0)
return;
- status = AcpiEnterSleepStatePrep(ACPI_STATE_S5);
- if (ACPI_FAILURE(status)) {
- printf("AcpiEnterSleepStatePrep failed - %s\n",
- AcpiFormatException(status));
- return;
- }
ACPI_DISABLE_IRQS();
status = AcpiEnterSleepState(ACPI_STATE_S5);
if (ACPI_FAILURE(status)) {
==== //depot/projects/power/sys/dev/acpica/acpi_pci.c#14 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.13 2004/04/14 17:46:21 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.14 2004/04/26 02:11:38 imp Exp $");
#include "opt_bus.h"
@@ -207,7 +207,7 @@
acpi_state, device_get_nameunit(child),
AcpiFormatException(status));
}
- if (state > old_state)
+ if (old_state > state)
return (pci_set_powerstate_method(dev, child, state));
else
return (0);
==== //depot/projects/power/sys/dev/ata/ata-lowlevel.c#9 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.33 2004/04/19 18:29:43 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.34 2004/04/27 15:52:08 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -635,17 +635,17 @@
}
}
if (mask == 0x01) /* wait for master only */
- if (!(stat0 & ATA_S_BUSY) || (stat0 == 0xff && timeout > 20))
+ if (!(stat0 & ATA_S_BUSY) || (stat0 == 0xff && timeout > 5))
break;
if (mask == 0x02) /* wait for slave only */
- if (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20))
+ if (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 5))
break;
if (mask == 0x03) { /* wait for both master & slave */
if (!(stat0 & ATA_S_BUSY) && !(stat1 & ATA_S_BUSY))
break;
- if (stat0 == 0xff && timeout > 20)
+ if (stat0 == 0xff && timeout > 5)
mask &= ~0x01;
- if (stat1 == 0xff && timeout > 20)
+ if (stat1 == 0xff && timeout > 5)
mask &= ~0x02;
}
DELAY(100000);
==== //depot/projects/power/sys/dev/ata/ata-pci.c#10 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.81 2004/04/24 16:32:06 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.82 2004/04/27 12:54:59 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -164,8 +164,7 @@
{
struct ata_pci_controller *ctlr = device_get_softc(dev);
u_int32_t cmd;
- u_int8_t progif;
- int unit, prisec = 0;
+ int unit;
/* do chipset specific setups only needed once */
if (ata_legacy(dev) || pci_read_config(dev, 0x18, 4) & IOMASK)
@@ -176,10 +175,6 @@
ctlr->dmainit = ata_pci_dmainit;
ctlr->locking = ata_pci_locknoop;
- progif = pci_read_config(dev, PCIR_PROGIF, 1);
- if ((progif & 0x80))
- prisec = 1;
-
/* if needed try to enable busmastering */
cmd = pci_read_config(dev, PCIR_COMMAND, 2);
if (!(cmd & PCIM_CMD_BUSMASTEREN)) {
@@ -199,7 +194,7 @@
/* attach all channels on this controller */
for (unit = 0; unit < ctlr->channels; unit++)
- device_add_child(dev, "ata", prisec ?
+ device_add_child(dev, "ata", (pci_get_progif(dev) & 0x85) == 0x80 ?
unit : devclass_find_free_unit(ata_devclass, 2));
return bus_generic_attach(dev);
==== //depot/projects/power/sys/dev/ciss/ciss.c#9 (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/dev/ciss/ciss.c,v 1.44 2004/04/19 17:16:06 ps Exp $
+ * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.45 2004/04/26 19:28:08 ps Exp $
*/
/*
@@ -1411,7 +1411,9 @@
struct ciss_request *cr;
struct ciss_command *cc;
struct ciss_bmic_cdb *cbc;
- int error;
+ int error, ldrive;
+
+ ldrive = CISS_LUN_TO_TARGET(ld->cl_address.logical.lun);
debug(0, "bringing logical drive %d back online %ssynchronously",
ldrive, async ? "a" : "");
@@ -1425,7 +1427,7 @@
cc = CISS_FIND_COMMAND(cr);
cc->header.address = *ld->cl_controller; /* target controller */
cbc = (struct ciss_bmic_cdb *)&(cc->cdb.cdb[0]);
- cbc->log_drive = CISS_LUN_TO_TARGET(ld->cl_address.logical.lun);
+ cbc->log_drive = ldrive;
/*
* Dispatch the request asynchronously if we can't sleep waiting
@@ -3568,7 +3570,7 @@
static void
ciss_print_adapter(struct ciss_softc *sc)
{
- int i;
+ int i, j;
ciss_printf(sc, "ADAPTER:\n");
for (i = 0; i < CISSQ_COUNT; i++) {
@@ -3579,14 +3581,14 @@
sc->ciss_qstat[i].q_max);
}
ciss_printf(sc, "max_requests %d\n", sc->ciss_max_requests);
- ciss_printf(sc, "notify_head/tail %d/%d\n",
- sc->ciss_notify_head, sc->ciss_notify_tail);
ciss_printf(sc, "flags %b\n", sc->ciss_flags,
"\20\1notify_ok\2control_open\3aborting\4running\21fake_synch\22bmic_abort\n");
- for (i = 0; i < CISS_MAX_LOGICAL; i++) {
- ciss_printf(sc, "LOGICAL DRIVE %d: ", i);
- ciss_print_ldrive(sc, sc->ciss_logical + i);
+ for (i = 0; i < sc->ciss_max_bus_number; i++) {
+ for (j = 0; j < CISS_MAX_LOGICAL; j++) {
+ ciss_printf(sc, "LOGICAL DRIVE %d: ", i);
+ ciss_print_ldrive(sc, &sc->ciss_logical[i][j]);
+ }
}
for (i = 1; i < sc->ciss_max_requests; i++)
==== //depot/projects/power/sys/dev/led/led.c#5 (text+ko) ====
@@ -9,7 +9,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.8 2004/02/21 21:10:43 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.9 2004/04/27 13:09:21 phk Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -52,10 +52,14 @@
sc->count--;
continue;
}
- if (*sc->ptr >= 'a' && *sc->ptr <= 'j')
+ if (*sc->ptr == '.') {
+ sc->ptr = NULL;
+ continue;
+ } else if (*sc->ptr >= 'a' && *sc->ptr <= 'j') {
sc->func(sc->private, 0);
- else if (*sc->ptr >= 'A' && *sc->ptr <= 'J')
+ } else if (*sc->ptr >= 'A' && *sc->ptr <= 'J') {
sc->func(sc->private, 1);
+ }
sc->count = *sc->ptr & 0xf;
sc->ptr++;
if (*sc->ptr == '\0')
@@ -153,11 +157,10 @@
*/
case 's':
for(s++; *s; s++) {
- if ((*s & 0x0f) > 10)
- continue;
- if ((*s & 0xf0) < ' ')
- continue;
- sbuf_bcat(sb, s, 1);
+ if ((*s >= 'a' && *s <= 'j') ||
+ (*s >= 'A' && *s <= 'J') ||
+ *s == '.')
+ sbuf_bcat(sb, s, 1);
}
break;
/*
@@ -249,6 +252,7 @@
sbuf_delete(sb);
mtx_lock(&led_mtx);
LIST_INSERT_HEAD(&led_list, sc, list);
+ sc->func(sc->private, 0);
mtx_unlock(&led_mtx);
return (sc->dev);
}
==== //depot/projects/power/sys/dev/pci/pci.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/pci/pci.c,v 1.248 2004/04/23 15:48:48 marius Exp $
+ * $FreeBSD: src/sys/dev/pci/pci.c,v 1.249 2004/04/26 02:11:38 imp Exp $
*
*/
@@ -495,7 +495,7 @@
/*
* Dx -> Dx is a nop always.
*/
- if (pci_get_powerstate(dev) == state)
+ if (pci_get_powerstate(child) == state)
return (0);
if (cfg->pp.pp_cap != 0) {
==== //depot/projects/power/sys/dev/usb/usbdevs#10 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.172 2004/04/27 13:55:26 sanpei Exp $
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -374,6 +374,7 @@
vendor DLINK 0x2001 D-Link
vendor VIDZMEDIA 0x3275 VidzMedia Pte Ltd
vendor DAISY 0x3579 Daisy Technology
+vendor DELL 0x413c Dell
vendor INTEL 0x8086 Intel
vendor HP2 0xf003 Hewlett Packard
@@ -591,6 +592,9 @@
/* Dallas Semiconductor products */
product DALLAS J6502 0x4201 J-6502 speakers
+/* Dell products */
+product DELL BC02 0x8000 Dell BC02 Bluetooth USB Adapter
+
/* Diamond products */
product DIAMOND RIO500USB 0x0001 Rio 500 USB
==== //depot/projects/power/sys/dev/usb/usbdevs.h#10 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.178 2004/04/25 11:24:40 sanpei Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.179 2004/04/27 13:56:39 sanpei Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.172 2004/04/27 13:55:26 sanpei Exp
*/
/*
@@ -381,6 +381,7 @@
#define USB_VENDOR_DLINK 0x2001 /* D-Link */
#define USB_VENDOR_VIDZMEDIA 0x3275 /* VidzMedia Pte Ltd */
#define USB_VENDOR_DAISY 0x3579 /* Daisy Technology */
+#define USB_VENDOR_DELL 0x413c /* Dell */
#define USB_VENDOR_INTEL 0x8086 /* Intel */
#define USB_VENDOR_HP2 0xf003 /* Hewlett Packard */
@@ -598,6 +599,9 @@
/* Dallas Semiconductor products */
#define USB_PRODUCT_DALLAS_J6502 0x4201 /* J-6502 speakers */
+/* Dell products */
+#define USB_PRODUCT_DELL_BC02 0x8000 /* Dell BC02 Bluetooth USB Adapter */
+
/* Diamond products */
#define USB_PRODUCT_DIAMOND_RIO500USB 0x0001 /* Rio 500 USB */
==== //depot/projects/power/sys/dev/usb/usbdevs_data.h#10 (text+ko) ====
@@ -1,10 +1,10 @@
-/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.178 2004/04/25 11:24:40 sanpei Exp $ */
+/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.179 2004/04/27 13:56:39 sanpei Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.172 2004/04/27 13:55:26 sanpei Exp
*/
/*
@@ -772,6 +772,12 @@
"J-6502 speakers",
},
{
+ USB_VENDOR_DELL, USB_PRODUCT_DELL_BC02,
+ 0,
+ "Dell",
+ "Dell BC02 Bluetooth USB Adapter",
+ },
+ {
USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
0,
"Diamond",
@@ -5218,6 +5224,12 @@
NULL,
},
{
+ USB_VENDOR_DELL, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Dell",
+ NULL,
+ },
+ {
USB_VENDOR_INTEL, 0,
USB_KNOWNDEV_NOPROD,
"Intel",
==== //depot/projects/power/sys/i386/conf/GENERIC#9 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.401 2004/04/22 15:17:39 imp Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.402 2004/04/26 22:52:09 sobomax Exp $
machine i386
cpu I486_CPU
@@ -268,6 +268,7 @@
device axe # ASIX Electronics USB ethernet
device cue # CATC USB ethernet
device kue # Kawasaki LSI USB ethernet
+device rue # RealTek RTL8150 USB ethernet
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/power/sys/i386/i386/elan-mmcr.c#8 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.27 2004/04/03 18:42:52 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.28 2004/04/27 13:08:03 phk Exp $");
#include "opt_cpu.h"
#include <sys/param.h>
@@ -189,10 +189,10 @@
if (led_dev[i])
break;
sprintf(tmp, "gpio%d", i);
+ mmcrptr[(0xc2a + v) / 2] |= u;
+ gpio_config[i] = buf[i];
led_dev[i] =
led_create(gpio_led, &led_cookie[i], tmp);
- mmcrptr[(0xc2a + v) / 2] |= u;
- gpio_config[i] = buf[i];
break;
case '.':
gpio_config[i] = buf[i];
==== //depot/projects/power/sys/kern/kern_jail.c#3 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.41 2004/03/15 12:10:34 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.42 2004/04/26 19:46:52 bmilekic Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -59,6 +59,11 @@
&jail_getfsstatroot_only, 0,
"Processes see only their root file system in getfsstat()");
+int jail_allow_raw_sockets = 0;
+SYSCTL_INT(_security_jail, OID_AUTO, allow_raw_sockets, CTLFLAG_RW,
+ &jail_allow_raw_sockets, 0,
+ "Prison root can create raw sockets");
+
/* allprison, lastprid, and prisoncount are protected by allprison_mtx. */
struct prisonlist allprison;
struct mtx allprison_mtx;
==== //depot/projects/power/sys/kern/vfs_syscalls.c#9 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.344 2004/04/22 15:40:27 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.345 2004/04/26 15:44:42 pjd Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -183,7 +183,7 @@
caddr_t arg;
} */ *uap;
{
- struct mount *mp;
+ struct mount *mp, *vmp;
int error;
struct nameidata nd;
@@ -193,14 +193,13 @@
if ((error = namei(&nd)) != 0)
return (error);
NDFREE(&nd, NDF_ONLY_PNBUF);
- error = vn_start_write(nd.ni_vp, &mp, V_WAIT | PCATCH);
+ error = vn_start_write(nd.ni_vp, &vmp, V_WAIT | PCATCH);
+ mp = nd.ni_vp->v_mount;
vrele(nd.ni_vp);
if (error)
return (error);
- if (mp == NULL)
- return (EOPNOTSUPP);
error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, uap->arg, td);
- vn_finished_write(mp);
+ vn_finished_write(vmp);
return (error);
}
==== //depot/projects/power/sys/modules/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.375 2004/03/29 22:41:21 peter Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.376 2004/04/27 17:57:45 vkashyap Exp $
# pcic -- currently broken and being worked on out of tree.
# oldcard -- specialized use for debugging only.
@@ -203,6 +203,7 @@
ti \
tl \
trm \
+ ${_twa} \
twe \
tx \
txp \
@@ -350,6 +351,7 @@
_ips= ips
_mly= mly
_s3= s3
+_twa= twa
_vesa= vesa
.elif ${MACHINE} == "pc98"
_canbepm= canbepm
==== //depot/projects/power/sys/net/rtsock.c#8 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)rtsock.c 8.7 (Berkeley) 10/12/95
- * $FreeBSD: src/sys/net/rtsock.c,v 1.107 2004/04/19 07:20:32 ru Exp $
+ * $FreeBSD: src/sys/net/rtsock.c,v 1.108 2004/04/26 19:46:52 bmilekic Exp $
*/
#include <sys/param.h>
@@ -48,6 +48,8 @@
#include <net/raw_cb.h>
#include <net/route.h>
+#include <netinet/in.h>
+
MALLOC_DEFINE(M_RTABLE, "routetbl", "routing tables");
/* NB: these are not modified */
@@ -287,6 +289,7 @@
int len, error = 0;
struct ifnet *ifp = NULL;
struct ifaddr *ifa = NULL;
+ struct sockaddr_in jail;
#define senderr(e) { error = e; goto flush;}
if (m == NULL || ((m->m_len < sizeof(long)) &&
@@ -400,8 +403,16 @@
if (ifp) {
info.rti_info[RTAX_IFP] =
ifaddr_byindex(ifp->if_index)->ifa_addr;
- info.rti_info[RTAX_IFA] =
- rt->rt_ifa->ifa_addr;
+ if (jailed(so->so_cred)) {
+ jail.sin_family = PF_INET;
+ jail.sin_len = sizeof(jail);
+ jail.sin_addr.s_addr =
+ htonl(prison_getip(so->so_cred));
+ info.rti_info[RTAX_IFA] =
+ (struct sockaddr *)&jail;
+ } else
+ info.rti_info[RTAX_IFA] =
+ rt->rt_ifa->ifa_addr;
if (ifp->if_flags & IFF_POINTOPOINT)
info.rti_info[RTAX_BRD] =
rt->rt_ifa->ifa_dstaddr;
==== //depot/projects/power/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: ng_bluetooth.c,v 1.3 2003/04/26 22:37:31 max Exp $
- * $FreeBSD: src/sys/netgraph/bluetooth/common/ng_bluetooth.c,v 1.2 2003/05/10 21:44:39 julian Exp $
+ * $FreeBSD: src/sys/netgraph/bluetooth/common/ng_bluetooth.c,v 1.3 2004/04/27 16:38:13 emax Exp $
*/
#include <sys/param.h>
@@ -35,7 +35,7 @@
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include "ng_bluetooth.h"
+#include <netgraph/bluetooth/include/ng_bluetooth.h>
/*
* Bluetooth stack sysctl globals
==== //depot/projects/power/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list