From owner-p4-projects@FreeBSD.ORG Fri Jun 11 15:41:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3F481065675; Fri, 11 Jun 2010 15:41:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 901DB1065670 for ; Fri, 11 Jun 2010 15:41:36 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DEF48FC19 for ; Fri, 11 Jun 2010 15:41:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5BFfa79026498 for ; Fri, 11 Jun 2010 15:41:36 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5BFfa6p026496 for perforce@freebsd.org; Fri, 11 Jun 2010 15:41:36 GMT (envelope-from afiveg@FreeBSD.org) Date: Fri, 11 Jun 2010 15:41:36 GMT Message-Id: <201006111541.o5BFfa6p026496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2010 15:41:37 -0000 http://p4web.freebsd.org/@@179469?ac=10 Change 179469 by afiveg@cottonmouth on 2010/06/11 15:41:24 ringmap is in CURRENT integrated but doesn't work correctly. Now, to activate ringmap, should KERNEL_RINGMAP and LIBPCAP_RINGMAP in make.conf be set. Submitted by: Alexander Fiveg Affected files ... .. //depot/projects/soc2010/ringmap/current/Makefile#3 edit .. //depot/projects/soc2010/ringmap/current/sys/conf/files#3 edit .. //depot/projects/soc2010/ringmap/current/sys/conf/options#3 edit .. //depot/projects/soc2010/ringmap/current/sys/i386/conf/I686RINGMAP_CURRENT#2 edit .. //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#3 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#2 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#2 edit .. //depot/projects/soc2010/ringmap/current/usr.bin/kdump/Makefile#3 edit .. //depot/projects/soc2010/ringmap/current/usr.bin/kdump/mkioctls#3 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/Makefile#3 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/conf/files#3 (text+ko) ==== @@ -2351,7 +2351,6 @@ net/radix_mpath.c standard net/raw_cb.c standard net/raw_usrreq.c standard -net/ringmap.c optional em | ixgbe net/route.c standard net/rtsock.c standard net/slcompress.c optional netgraph_vjc | sppp | \ ==== //depot/projects/soc2010/ringmap/current/sys/conf/options#3 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/i386/conf/I686RINGMAP_CURRENT#2 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#3 (text+ko) ==== @@ -11,8 +11,8 @@ SRCS += $(CORE_SRC) $(LEGACY_SRC) SRCS += $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED) -.if defined(RINGMAP) -CFLAGS += D__RINGMAP__ +.if defined(KERNEL_RINGMAP) +CFLAGS += -D__RINGMAP__ -I SRC += ${.CURDIR}/../../net/ringmap.c .endif ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ extern void em_print_debug_info(struct adapter *); #endif -#include +#include "ringmap.h" /* DON'T TOUCH IT */ int fiveg_da_2009 = 1; ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#2 (text+ko) ==== @@ -1,5 +1,7 @@ #ifdef __E1000_RINGMAP__ -#include "../dev/e1000/ringmap_e1000.h" +#ifdef _KERNEL +#include "ringmap_e1000.h" +#endif #endif /* Minimum distance to be kept between the userrp and RDT to provide a @@ -25,6 +27,10 @@ // #define DEV_ID 0x105E #define DEV_ID 0 +#ifndef _KERNEL +#include +#endif + struct address { bus_addr_t phys; vm_offset_t kern; @@ -133,6 +139,7 @@ #include + /* ************************************* * IOCTL ' s system calls * * *************************************/ ==== //depot/projects/soc2010/ringmap/current/usr.bin/kdump/Makefile#3 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/usr.bin/kdump/mkioctls#3 (text+ko) ====