From owner-svn-src-all@FreeBSD.ORG Wed Apr 14 23:06:07 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3EB5106564A; Wed, 14 Apr 2010 23:06:07 +0000 (UTC) (envelope-from julian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 98B778FC0A; Wed, 14 Apr 2010 23:06:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3EN67ES014142; Wed, 14 Apr 2010 23:06:07 GMT (envelope-from julian@svn.freebsd.org) Received: (from julian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3EN67gI014138; Wed, 14 Apr 2010 23:06:07 GMT (envelope-from julian@svn.freebsd.org) Message-Id: <201004142306.o3EN67gI014138@svn.freebsd.org> From: Julian Elischer Date: Wed, 14 Apr 2010 23:06:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206639 - in head/sys: ddb net X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2010 23:06:07 -0000 Author: julian Date: Wed Apr 14 23:06:07 2010 New Revision: 206639 URL: http://svn.freebsd.org/changeset/base/206639 Log: Move two copies of the same definition to a common include file. MFC after: 3 weeks Modified: head/sys/ddb/db_sym.c head/sys/net/vnet.c head/sys/net/vnet.h Modified: head/sys/ddb/db_sym.c ============================================================================== --- head/sys/ddb/db_sym.c Wed Apr 14 22:03:48 2010 (r206638) +++ head/sys/ddb/db_sym.c Wed Apr 14 23:06:07 2010 (r206639) @@ -64,12 +64,6 @@ static boolean_t db_line_at_pc(c_db_sym_ static int db_cpu = -1; #ifdef VIMAGE -extern uintptr_t *__start_set_vnet; -extern uintptr_t *__stop_set_vnet; - -#define VNET_START (uintptr_t)&__start_set_vnet -#define VNET_STOP (uintptr_t)&__stop_set_vnet - static void *db_vnet = NULL; #endif Modified: head/sys/net/vnet.c ============================================================================== --- head/sys/net/vnet.c Wed Apr 14 22:03:48 2010 (r206638) +++ head/sys/net/vnet.c Wed Apr 14 23:06:07 2010 (r206639) @@ -154,15 +154,6 @@ struct vnet *vnet0; */ /* - * Location of the kernel's 'set_vnet' linker set. - */ -extern uintptr_t *__start_set_vnet; -extern uintptr_t *__stop_set_vnet; - -#define VNET_START (uintptr_t)&__start_set_vnet -#define VNET_STOP (uintptr_t)&__stop_set_vnet - -/* * Number of bytes of data in the 'set_vnet' linker set, and hence the total * size of all kernel virtualized global variables, and the malloc(9) type * that will be used to allocate it. Modified: head/sys/net/vnet.h ============================================================================== --- head/sys/net/vnet.h Wed Apr 14 22:03:48 2010 (r206638) +++ head/sys/net/vnet.h Wed Apr 14 23:06:07 2010 (r206639) @@ -92,6 +92,15 @@ struct vnet { #include /* + * Location of the kernel's 'set_vnet' linker set. + */ +extern uintptr_t *__start_set_vnet; +extern uintptr_t *__stop_set_vnet; + +#define VNET_START (uintptr_t)&__start_set_vnet +#define VNET_STOP (uintptr_t)&__stop_set_vnet + +/* * Functions to allocate and destroy virtual network stacks. */ struct vnet *vnet_alloc(void);