PERFORCE change 147868 for review
Julian Elischer
julian at FreeBSD.org
Wed Aug 20 02:25:32 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=147868
Change 147868 by julian at julian_trafmon1 on 2008/08/20 02:25:13
IFC from -current
Affected files ...
.. //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate
.. //depot/projects/vimage-commit3/src/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/arm/at91/at91.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pio.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_piovar.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pmc.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/arm/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/acpi_support/acpi_asus.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/i386/bpf_jit_machdep.c#4 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/i386/bpf_jit_machdep.h#4 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/include/pcpu.h#3 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/include/pmap.h#4 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenpmap.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/i386/xen/xen_machdep.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/ia64/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/vimage-commit3/src/sys/mips/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/net/bpf_jitter.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/net/bpf_jitter.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/net/if.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/netgraph/ng_base.c#8 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/ip_mroute.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_hostcache.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_input.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_subr.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet/tcp_syncache.c#7 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_gif.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_ifattach.c#7 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/in6_pcb.c#6 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/nd6.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/netinet6/nd6_rtr.c#5 integrate
.. //depot/projects/vimage-commit3/src/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/sparc64/include/pcpu.h#3 integrate
.. //depot/projects/vimage-commit3/src/sys/sun4v/include/pcpu.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/sys/pcpu.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/sys/sysctl.h#3 integrate
.. //depot/projects/vimage-commit3/src/sys/sys/types.h#2 integrate
.. //depot/projects/vimage-commit3/src/sys/vm/vm_meter.c#2 integrate
.. //depot/projects/vimage-commit3/src/sys/xen/evtchn/evtchn_dev.c#2 integrate
Differences ...
==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.c#4 (text+ko) ====
@@ -30,18 +30,22 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.12 2008/08/18 19:14:26 jkim Exp $");
+#ifdef _KERNEL
#include "opt_bpf.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <sys/malloc.h>
+#include <net/if.h>
+#else
+#include <stdlib.h>
+#endif
+
+#include <sys/types.h>
-#include <net/if.h>
#include <net/bpf.h>
#include <net/bpf_jitter.h>
@@ -53,7 +57,7 @@
* emit routine to update the jump table
*/
static void
-emit_length(bpf_bin_stream *stream, u_int value, u_int len)
+emit_length(bpf_bin_stream *stream, __unused u_int value, u_int len)
{
(stream->refs)[stream->bpf_pc] += len;
@@ -108,8 +112,12 @@
return (NULL);
/* Allocate the reference table for the jumps */
+#ifdef _KERNEL
stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int),
M_BPFJIT, M_NOWAIT);
+#else
+ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int));
+#endif
if (stream.refs == NULL)
return (NULL);
@@ -141,7 +149,11 @@
switch (ins->code) {
default:
+#ifdef _KERNEL
return (NULL);
+#else
+ abort();
+#endif
case BPF_RET|BPF_K:
MOVid(ins->k, EAX);
@@ -155,11 +167,13 @@
break;
case BPF_LD|BPF_W|BPF_ABS:
- MOVid(ins->k, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int32_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(6);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JAb(12);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int32_t), ECX);
+ JAEb(6);
ZEROrd(EAX);
MOVrq3(R8, RBX);
RET();
@@ -169,11 +183,13 @@
case BPF_LD|BPF_H|BPF_ABS:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int16_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(4);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JAb(12);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int16_t), ECX);
+ JAEb(4);
MOVrq3(R8, RBX);
RET();
MOVobw(RBX, RSI, AX);
@@ -182,12 +198,12 @@
case BPF_LD|BPF_B|BPF_ABS:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- CMPrd(EDI, ECX);
- JBEb(4);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JBb(4);
MOVrq3(R8, RBX);
RET();
- MOVobb(RBX, RCX, AL);
+ MOVobb(RBX, RSI, AL);
break;
case BPF_LD|BPF_W|BPF_LEN:
@@ -199,12 +215,18 @@
break;
case BPF_LD|BPF_W|BPF_IND:
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int32_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(6);
+ CMPrd(EDI, EDX);
+ JAb(27);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JBb(14);
+ ADDrd(EDX, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int32_t), ECX);
+ JAEb(6);
ZEROrd(EAX);
MOVrq3(R8, RBX);
RET();
@@ -214,12 +236,18 @@
case BPF_LD|BPF_H|BPF_IND:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int16_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(4);
+ CMPrd(EDI, EDX);
+ JAb(27);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JBb(14);
+ ADDrd(EDX, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int16_t), ECX);
+ JAEb(4);
MOVrq3(R8, RBX);
RET();
MOVobw(RBX, RSI, AX);
@@ -228,24 +256,28 @@
case BPF_LD|BPF_B|BPF_IND:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- CMPrd(EDI, ECX);
- JBEb(4);
+ CMPrd(EDI, EDX);
+ JAEb(13);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JAb(4);
MOVrq3(R8, RBX);
RET();
- MOVobb(RBX, RCX, AL);
+ ADDrd(EDX, ESI);
+ MOVobb(RBX, RSI, AL);
break;
case BPF_LDX|BPF_MSH|BPF_B:
- MOVid(ins->k, ECX);
- CMPrd(EDI, ECX);
- JBEb(6);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JBb(6);
ZEROrd(EAX);
MOVrq3(R8, RBX);
RET();
ZEROrd(EDX);
- MOVobb(RBX, RCX, DL);
+ MOVobb(RBX, RSI, DL);
ANDib(0x0f, DL);
SHLib(2, EDX);
break;
@@ -450,11 +482,19 @@
if (pass == 2)
break;
+#ifdef _KERNEL
stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT);
if (stream.ibuf == NULL) {
free(stream.refs, M_BPFJIT);
return (NULL);
}
+#else
+ stream.ibuf = (char *)malloc(stream.cur_ip);
+ if (stream.ibuf == NULL) {
+ free(stream.refs);
+ return (NULL);
+ }
+#endif
/*
* modify the reference table to contain the offsets and
@@ -475,7 +515,11 @@
* the reference table is needed only during compilation,
* now we can free it
*/
+#ifdef _KERNEL
free(stream.refs, M_BPFJIT);
+#else
+ free(stream.refs);
+#endif
return ((bpf_filter_func)stream.ibuf);
}
==== //depot/projects/vimage-commit3/src/sys/amd64/amd64/bpf_jit_machdep.h#4 (text+ko) ====
@@ -28,7 +28,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/amd64/amd64/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.h,v 1.9 2008/08/18 19:14:26 jkim Exp $
*/
#ifndef _BPF_JIT_MACHDEP_H_
@@ -381,15 +381,27 @@
} \
} while (0)
+/* jb off8 */
+#define JBb(off8) do { \
+ emitm(&stream, 0x72, 1); \
+ emitm(&stream, off8, 1); \
+} while (0)
+
+/* jae off8 */
+#define JAEb(off8) do { \
+ emitm(&stream, 0x73, 1); \
+ emitm(&stream, off8, 1); \
+} while (0)
+
/* jne off8 */
#define JNEb(off8) do { \
emitm(&stream, 0x75, 1); \
emitm(&stream, off8, 1); \
} while (0)
-/* jbe off8 */
-#define JBEb(off8) do { \
- emitm(&stream, 0x76, 1); \
+/* ja off8 */
+#define JAb(off8) do { \
+ emitm(&stream, 0x77, 1); \
emitm(&stream, off8, 1); \
} while (0)
==== //depot/projects/vimage-commit3/src/sys/amd64/include/pcpu.h#2 (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/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.50 2008/08/19 19:53:52 jhb Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -33,8 +33,6 @@
#error "sys/cdefs.h is a prerequisite for this file"
#endif
-#ifdef _KERNEL
-
/*
* The SMP parts are setup in pmap.c and locore.s for the BSP, and
* mp_machdep.c sets up the data for the AP's to "see" when they awake.
@@ -52,6 +50,8 @@
u_int pc_apic_id; \
u_int pc_acpi_id /* ACPI CPU id */
+#ifdef _KERNEL
+
#ifdef lint
extern struct pcpu *pcpup;
==== //depot/projects/vimage-commit3/src/sys/arm/at91/at91.c#2 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.16 2008/04/20 23:29:06 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.17 2008/08/19 22:15:14 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -304,7 +304,7 @@
{
"at91_udp", 0,
AT91RM92_BASE + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE,
- AT91RM92_IRQ_UDP
+ AT91RM92_IRQ_UDP, AT91RM92_IRQ_PIOB
},
{
"at91_mci", 0,
==== //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pio.c#2 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.5 2007/02/23 12:18:27 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.6 2008/08/19 22:17:14 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -349,6 +349,49 @@
PIO[PIO_CODR / 4] = data_mask;
}
+uint8_t
+at91_pio_gpio_get(uint32_t pio, uint32_t data_mask)
+{
+ uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio);
+
+ data_mask &= PIO[PIO_PDSR / 4];
+
+ return (data_mask ? 1 : 0);
+}
+
+void
+at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch)
+{
+ uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio);
+
+ if (use_deglitch)
+ PIO[PIO_IFER / 4] = data_mask;
+ else
+ PIO[PIO_IFDR / 4] = data_mask;
+ return;
+}
+
+void
+at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask,
+ int enable_interrupt)
+{
+ uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio);
+
+ if (enable_interrupt)
+ PIO[PIO_IER / 4] = data_mask;
+ else
+ PIO[PIO_IDR / 4] = data_mask;
+ return;
+}
+
+uint32_t
+at91_pio_gpio_clear_interrupt(uint32_t pio)
+{
+ uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio);
+ /* reading this register will clear the interrupts */
+ return (PIO[PIO_ISR / 4]);
+}
+
static device_method_t at91_pio_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, at91_pio_probe),
==== //depot/projects/vimage-commit3/src/sys/arm/at91/at91_piovar.h#2 (text+ko) ====
@@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.2 2006/07/14 22:22:57 imp Exp $ */
+/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.3 2008/08/19 22:17:14 imp Exp $ */
#ifndef ARM_AT91_AT91_PIOVAR_H
#define ARM_AT91_AT91_PIOVAR_H
@@ -35,5 +35,9 @@
int use_pullup);
void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask);
void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask);
+uint8_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask);
+void at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch);
+void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt);
+uint32_t at91_pio_gpio_clear_interrupt(uint32_t pio);
#endif /* ARM_AT91_AT91_PIOVAR_H */
==== //depot/projects/vimage-commit3/src/sys/arm/at91/at91_pmc.c#3 (text) ====
@@ -25,7 +25,7 @@
#include "opt_at91.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.6 2008/07/22 14:04:06 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.7 2008/08/19 22:16:10 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@
static struct at91_pmc_clock ohci_clk = {
.name = "ohci_clk",
.parent = &mck,
- .pmc_mask = 1 << AT91RM92_IRQ_UDP,
+ .pmc_mask = 1 << AT91RM92_IRQ_UHP,
.set_mode = &at91_pmc_set_periph_mode
};
==== //depot/projects/vimage-commit3/src/sys/arm/include/pcpu.h#2 (text+ko) ====
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*
* from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27
- * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $
+ * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.7 2008/08/19 19:53:52 jhb Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -38,6 +38,8 @@
struct vmspace;
+#endif /* _KERNEL */
+
/*
* Inside the kernel, the globally reserved register g7 is used to
* point at the globaldata structure.
@@ -45,6 +47,8 @@
#define PCPU_MD_FIELDS \
struct pcup *pc_prvspace;
+#ifdef _KERNEL
+
struct pcb;
struct pcpu;
==== //depot/projects/vimage-commit3/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.5 2008/06/11 18:55:19 ed Exp $
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.6 2008/08/19 21:28:58 jb Exp $
*/
/*
@@ -13616,7 +13616,9 @@
cyclic_remove(state->dts_deadman);
#else
callout_stop(&state->dts_cleaner);
+ callout_drain(&state->dts_cleaner);
callout_stop(&state->dts_deadman);
+ callout_drain(&state->dts_deadman);
#endif
dtrace_dstate_fini(&vstate->dtvs_dynvars);
==== //depot/projects/vimage-commit3/src/sys/dev/acpi_support/acpi_asus.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.37 2008/08/09 11:14:05 des Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.38 2008/08/19 22:28:24 rpaulo Exp $");
/*
* Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
@@ -291,7 +291,7 @@
},
{
.name = "L8L"
- /* Only has hotkeys, apparantly */
+ /* Only has hotkeys, apparently */
},
{
.name = "M1A",
==== //depot/projects/vimage-commit3/src/sys/dev/sound/midi/sequencer.c#2 (text) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.28 2008/05/21 23:04:10 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.29 2008/08/19 19:45:08 ed Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,6 @@
#include <sys/lock.h>
#include <sys/sockio.h>
#include <sys/fcntl.h>
-#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
==== //depot/projects/vimage-commit3/src/sys/dev/sound/pcm/sound.h#2 (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/sound/pcm/sound.h,v 1.78 2007/06/16 03:37:28 ariff Exp $
+ * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.79 2008/08/19 19:45:08 ed Exp $
*/
/*
@@ -41,7 +41,7 @@
#include <sys/filio.h>
#include <sys/sockio.h>
#include <sys/fcntl.h>
-#include <sys/tty.h>
+#include <sys/selinfo.h>
#include <sys/proc.h>
#include <sys/kernel.h> /* for DATA_SET */
#include <sys/module.h>
==== //depot/projects/vimage-commit3/src/sys/dev/usb/if_rum.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.25 2008/07/30 00:38:10 thompsa Exp $ */
+/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.26 2008/08/19 01:44:56 kevlo Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini at free.fr>
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.25 2008/07/30 00:38:10 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.26 2008/08/19 01:44:56 kevlo Exp $");
/*-
* Ralink Technology RT2501USB/RT2601USB chipset driver
@@ -98,6 +98,7 @@
{ USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1 },
{ USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340 },
{ USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111 },
+ { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA110 },
{ USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWB01GS },
{ USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWI05GS },
{ USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT2573 },
==== //depot/projects/vimage-commit3/src/sys/dev/usb/usbdevs#5 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.364 2008/08/11 03:57:31 weongyo Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.365 2008/08/19 01:44:56 kevlo Exp $
/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
/*-
@@ -1149,6 +1149,7 @@
product DLINK2 DWLG122C1 0x3c03 DWL-G122 c1
product DLINK2 WUA1340 0x3c04 WUA-1340
product DLINK2 DWA111 0x3c06 DWA-111
+product DLINK2 DWA110 0x3c07 DWA-110
/* DMI products */
product DMI CFSM_RW 0xa109 CF/SM Reader/Writer
==== //depot/projects/vimage-commit3/src/sys/i386/i386/bpf_jit_machdep.c#4 (text+ko) ====
@@ -30,18 +30,22 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/bpf_jit_machdep.c,v 1.10 2008/08/13 19:52:00 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/bpf_jit_machdep.c,v 1.12 2008/08/18 21:17:47 jkim Exp $");
+#ifdef _KERNEL
#include "opt_bpf.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <sys/malloc.h>
+#include <net/if.h>
+#else
+#include <stdlib.h>
+#endif
+
+#include <sys/types.h>
-#include <net/if.h>
#include <net/bpf.h>
#include <net/bpf_jitter.h>
@@ -53,7 +57,7 @@
* emit routine to update the jump table
*/
static void
-emit_length(bpf_bin_stream *stream, u_int value, u_int len)
+emit_length(bpf_bin_stream *stream, __unused u_int value, u_int len)
{
(stream->refs)[stream->bpf_pc] += len;
@@ -108,8 +112,12 @@
return (NULL);
/* Allocate the reference table for the jumps */
+#ifdef _KERNEL
stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int),
M_BPFJIT, M_NOWAIT);
+#else
+ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int));
+#endif
if (stream.refs == NULL)
return (NULL);
@@ -144,7 +152,11 @@
switch (ins->code) {
default:
+#ifdef _KERNEL
return (NULL);
+#else
+ abort();
+#endif
case BPF_RET|BPF_K:
MOVid(ins->k, EAX);
@@ -162,11 +174,13 @@
break;
case BPF_LD|BPF_W|BPF_ABS:
- MOVid(ins->k, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int32_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(7);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JAb(12);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int32_t), ECX);
+ JAEb(7);
ZEROrd(EAX);
POP(EBX);
POP(ESI);
@@ -178,11 +192,13 @@
case BPF_LD|BPF_H|BPF_ABS:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int16_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(5);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JAb(12);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int16_t), ECX);
+ JAEb(5);
POP(EBX);
POP(ESI);
POP(EDI);
@@ -193,14 +209,14 @@
case BPF_LD|BPF_B|BPF_ABS:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- CMPrd(EDI, ECX);
- JBEb(5);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JBb(5);
POP(EBX);
POP(ESI);
POP(EDI);
LEAVE_RET();
- MOVobb(EBX, ECX, AL);
+ MOVobb(EBX, ESI, AL);
break;
case BPF_LD|BPF_W|BPF_LEN:
@@ -212,12 +228,18 @@
break;
case BPF_LD|BPF_W|BPF_IND:
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int32_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(7);
+ CMPrd(EDI, EDX);
+ JAb(27);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JBb(14);
+ ADDrd(EDX, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int32_t), ECX);
+ JAEb(7);
ZEROrd(EAX);
POP(EBX);
POP(ESI);
@@ -229,12 +251,18 @@
case BPF_LD|BPF_H|BPF_IND:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- MOVrd(ECX, ESI);
- ADDib(sizeof(int16_t), ECX);
- CMPrd(EDI, ECX);
- JBEb(5);
+ CMPrd(EDI, EDX);
+ JAb(27);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JBb(14);
+ ADDrd(EDX, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(ESI, ECX);
+ CMPid(sizeof(int16_t), ECX);
+ JAEb(5);
POP(EBX);
POP(ESI);
POP(EDI);
@@ -245,28 +273,32 @@
case BPF_LD|BPF_B|BPF_IND:
ZEROrd(EAX);
- MOVid(ins->k, ECX);
- ADDrd(EDX, ECX);
- CMPrd(EDI, ECX);
- JBEb(5);
+ CMPrd(EDI, EDX);
+ JAEb(13);
+ MOVid(ins->k, ESI);
+ MOVrd(EDI, ECX);
+ SUBrd(EDX, ECX);
+ CMPrd(ESI, ECX);
+ JAb(5);
POP(EBX);
POP(ESI);
POP(EDI);
LEAVE_RET();
- MOVobb(EBX, ECX, AL);
+ ADDrd(EDX, ESI);
+ MOVobb(EBX, ESI, AL);
break;
case BPF_LDX|BPF_MSH|BPF_B:
- MOVid(ins->k, ECX);
- CMPrd(EDI, ECX);
- JBEb(7);
+ MOVid(ins->k, ESI);
+ CMPrd(EDI, ESI);
+ JBb(7);
ZEROrd(EAX);
POP(EBX);
POP(ESI);
POP(EDI);
LEAVE_RET();
ZEROrd(EDX);
- MOVobb(EBX, ECX, DL);
+ MOVobb(EBX, ESI, DL);
ANDib(0x0f, DL);
SHLib(2, EDX);
break;
@@ -473,11 +505,19 @@
if (pass == 2)
break;
+#ifdef _KERNEL
stream.ibuf = (char *)malloc(stream.cur_ip, M_BPFJIT, M_NOWAIT);
if (stream.ibuf == NULL) {
free(stream.refs, M_BPFJIT);
return (NULL);
}
+#else
+ stream.ibuf = (char *)malloc(stream.cur_ip);
+ if (stream.ibuf == NULL) {
+ free(stream.refs);
+ return (NULL);
+ }
+#endif
/*
* modify the reference table to contain the offsets and
@@ -498,7 +538,11 @@
* the reference table is needed only during compilation,
* now we can free it
*/
+#ifdef _KERNEL
free(stream.refs, M_BPFJIT);
+#else
+ free(stream.refs);
+#endif
return ((bpf_filter_func)stream.ibuf);
}
==== //depot/projects/vimage-commit3/src/sys/i386/i386/bpf_jit_machdep.h#4 (text+ko) ====
@@ -28,7 +28,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/i386/i386/bpf_jit_machdep.h,v 1.8 2008/08/13 19:25:09 jkim Exp $
+ * $FreeBSD: src/sys/i386/i386/bpf_jit_machdep.h,v 1.9 2008/08/18 21:17:47 jkim Exp $
*/
#ifndef _BPF_JIT_MACHDEP_H_
@@ -331,15 +331,27 @@
} \
} while (0)
+/* jb off8 */
+#define JBb(off8) do { \
+ emitm(&stream, 0x72, 1); \
+ emitm(&stream, off8, 1); \
+} while (0)
+
+/* jae off8 */
+#define JAEb(off8) do { \
+ emitm(&stream, 0x73, 1); \
+ emitm(&stream, off8, 1); \
+} while (0)
+
/* jne off8 */
#define JNEb(off8) do { \
emitm(&stream, 0x75, 1); \
emitm(&stream, off8, 1); \
} while (0)
-/* jbe off8 */
-#define JBEb(off8) do { \
- emitm(&stream, 0x76, 1); \
+/* ja off8 */
+#define JAb(off8) do { \
+ emitm(&stream, 0x77, 1); \
emitm(&stream, off8, 1); \
} while (0)
==== //depot/projects/vimage-commit3/src/sys/i386/include/pcpu.h#3 (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/i386/include/pcpu.h,v 1.52 2008/08/15 20:51:31 kmacy Exp $
+ * $FreeBSD: src/sys/i386/include/pcpu.h,v 1.53 2008/08/19 19:53:52 jhb Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -33,8 +33,6 @@
#error "sys/cdefs.h is a prerequisite for this file"
#endif
-#ifdef _KERNEL
-
#include <machine/segments.h>
#include <machine/tss.h>
@@ -82,6 +80,9 @@
int pc_private_tss /* Flag indicating private tss */
#endif
+
+#ifdef _KERNEL
+
#ifdef lint
extern struct pcpu *pcpup;
==== //depot/projects/vimage-commit3/src/sys/i386/include/pmap.h#4 (text+ko) ====
@@ -38,7 +38,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/i386/include/pmap.h,v 1.134 2008/08/15 20:51:31 kmacy Exp $
+ * $FreeBSD: src/sys/i386/include/pmap.h,v 1.135 2008/08/18 21:35:09 kmacy Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -283,6 +283,8 @@
}
return pa;
}
+
+#define PT_UPDATES_FLUSH()
#endif
#if defined(PAE) && !defined(XEN)
==== //depot/projects/vimage-commit3/src/sys/i386/include/xen/xenpmap.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
- * $FreeBSD: src/sys/i386/include/xen/xenpmap.h,v 1.2 2008/08/15 04:00:44 kmacy Exp $
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list