PERFORCE change 104329 for review
Warner Losh
imp at FreeBSD.org
Thu Aug 17 00:06:46 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=104329
Change 104329 by imp at imp_lighthouse on 2006/08/17 00:06:10
IFC @104382
Affected files ...
.. //depot/projects/arm/src/sys/amd64/amd64/support.S#4 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#8 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#6 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#7 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#16 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#16 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#13 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#16 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#18 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#27 integrate
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#11 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#14 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.c#24 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.master#17 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_lock.c#4 integrate
Differences ...
==== //depot/projects/arm/src/sys/amd64/amd64/support.S#4 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.118 2006/08/15 22:43:02 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.119 2006/08/16 22:22:28 davidxu Exp $
*/
#include "opt_ddb.h"
@@ -432,7 +432,7 @@
ja fusufault
movq %rsi,(%rdi)
- xorq %rax,%rax
+ xorl %eax,%eax
movq PCPU(CURPCB),%rcx
movq %rax,PCB_ONFAULT(%rcx)
ret
==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#8 (text) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.1 2006/04/21 06:48:52 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.2 2006/08/16 23:14:52 imp Exp $
.PATH: ${.CURDIR}/../boot0
==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#6 (text) ====
==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#7 (text) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.1 2006/04/21 06:51:08 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.2 2006/08/16 23:18:07 imp Exp $
.PATH: ${.CURDIR}/../boot0
==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#16 (text) ====
==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#16 (text+ko) ====
==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#13 (text+ko) ====
@@ -1,9 +1,8 @@
-# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.2 2006/08/16 23:39:58 imp Exp $
P=bootspi
FILES=${P}
SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c
-#SRCS+=ints.c mci_device.c sd-card.c stormy16-lib2.c
NO_MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#16 (text+ko) ====
@@ -31,7 +31,7 @@
* owners. This software is not copyrighted and is intended for reference
* only.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.2 2006/08/16 23:39:58 imp Exp $
*/
#include "env_vars.h"
==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#18 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.3 2006/08/10 18:14:35 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.4 2006/08/16 23:39:58 imp Exp $
.include "${.CURDIR}/../Makefile.inc"
==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#27 (text+ko) ====
==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#11 (text+ko) ====
==== //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#14 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.71 2006/08/16 22:32:50 peter Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -754,3 +754,5 @@
466 AUE_NULL UNIMPL thr_setscheduler
467 AUE_NULL UNIMPL thr_getscheduler
468 AUE_NULL UNIMPL thr_setschedparam
+469 AUE_NULL UNIMPL __getpath_fromfd
+470 AUE_NULL UNIMPL __getpath_fromaddr
==== //depot/projects/arm/src/sys/dev/em/if_em.c#24 (text+ko) ====
@@ -31,7 +31,7 @@
***************************************************************************/
-/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.131 2006/08/14 09:52:35 glebius Exp $*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.132 2006/08/16 23:55:34 yongari Exp $*/
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -2865,8 +2865,6 @@
rx_buffer->m_head = m;
adapter->rx_desc_base[i].buffer_addr = htole64(segs[0].ds_addr);
- /* Zero out the receive descriptors status. */
- adapter->rx_desc_base[i].status = 0;
return (0);
}
@@ -3123,6 +3121,7 @@
/* Pointer to the receive descriptor being examined. */
struct em_rx_desc *current_desc;
+ uint8_t status;
ifp = adapter->ifp;
i = adapter->next_rx_desc_to_check;
@@ -3149,7 +3148,8 @@
accept_frame = 1;
prev_len_adj = 0;
desc_len = le16toh(current_desc->length);
- if (current_desc->status & E1000_RXD_STAT_EOP) {
+ status = current_desc->status;
+ if (status & E1000_RXD_STAT_EOP) {
count--;
eop = 1;
if (desc_len < ETHER_CRC_LEN) {
@@ -3170,9 +3170,8 @@
pkt_len += adapter->fmp->m_pkthdr.len;
last_byte = *(mtod(mp, caddr_t) + desc_len - 1);
- if (TBI_ACCEPT(&adapter->hw, current_desc->status,
- current_desc->errors,
- pkt_len, last_byte)) {
+ if (TBI_ACCEPT(&adapter->hw, status,
+ current_desc->errors, pkt_len, last_byte)) {
em_tbi_adjust_stats(&adapter->hw,
&adapter->stats, pkt_len,
adapter->hw.mac_addr);
@@ -3224,7 +3223,7 @@
em_fixup_rx(adapter) != 0)
goto skip;
#endif
- if (current_desc->status & E1000_RXD_STAT_VP)
+ if (status & E1000_RXD_STAT_VP)
VLAN_INPUT_TAG(ifp, adapter->fmp,
(le16toh(current_desc->special) &
E1000_RXD_SPC_VLAN_MASK));
@@ -3250,11 +3249,11 @@
adapter->fmp = NULL;
adapter->lmp = NULL;
}
- /* Zero out the receive descriptors status. */
- adapter->rx_desc_base[i].status = 0;
m = NULL;
}
+ /* Zero out the receive descriptors status. */
+ current_desc->status = 0;
bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map,
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
==== //depot/projects/arm/src/sys/kern/syscalls.master#17 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/kern/syscalls.master,v 1.222 2006/08/15 16:45:41 jhb Exp $
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.223 2006/08/16 22:32:50 peter Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
;
; System call name/number master file.
@@ -827,5 +827,7 @@
468 AUE_NULL STD { int thr_setschedparam(long id, \
const struct sched_param *param, \
int param_size); }
+469 AUE_NULL UNIMPL __getpath_fromfd
+470 AUE_NULL UNIMPL __getpath_fromaddr
; Please copy any additions and changes to the following compatability tables:
; sys/compat/freebsd32/syscalls.master
==== //depot/projects/arm/src/sys/nfsclient/nfs_lock.c#4 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.43 2006/01/13 23:16:29 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.44 2006/08/16 23:53:05 thomas Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,7 +290,7 @@
return (error);
/*
- * retry after 20 seconds if we haven't gotten a responce yet.
+ * Retry after 20 seconds if we haven't gotten a response yet.
* This number was picked out of thin air... but is longer
* then even a reasonably loaded system should take (at least
* on a local network). XXX Probably should use a back-off
More information about the p4-projects
mailing list