From owner-cvs-all@FreeBSD.ORG Sun Jul 3 01:26:17 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EBE716B5B7; Sun, 3 Jul 2005 01:02:19 +0000 (GMT) (envelope-from ps@mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70849453E2; Sun, 3 Jul 2005 00:53:06 +0000 (GMT) (envelope-from ps@mu.org) Received: by elvis.mu.org (Postfix, from userid 1000) id 6BC0E6EAA2; Sat, 2 Jul 2005 17:40:38 -0700 (PDT) X-Original-To: ps@mu.org Delivered-To: ps@mu.org Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by elvis.mu.org (Postfix) with ESMTP id BBCF35C915 for ; Mon, 21 Feb 2005 09:11:26 -0800 (PST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id ADC7256A91 for ; Mon, 21 Feb 2005 17:11:26 +0000 (GMT) (envelope-from owner-src-committers@FreeBSD.org) Received: by hub.freebsd.org (Postfix) id D115316A555; Mon, 21 Feb 2005 17:11:12 +0000 (GMT) Delivered-To: ps@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 538) id 575A616A4D0; Mon, 21 Feb 2005 17:11:11 +0000 (GMT) Delivered-To: src-committers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBEE816A4CE; Mon, 21 Feb 2005 17:11:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1C3E43D3F; Mon, 21 Feb 2005 17:11:09 +0000 (GMT) (envelope-from mlaier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1LHB95r047687; Mon, 21 Feb 2005 17:11:09 GMT (envelope-from mlaier@repoman.freebsd.org) Received: (from mlaier@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1LHB9LA047686; Mon, 21 Feb 2005 17:11:09 GMT (envelope-from mlaier) Message-Id: <200502211711.j1LHB9LA047686@repoman.freebsd.org> From: Max Laier To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Sender: owner-src-committers@FreeBSD.org Precedence: bulk X-Loop: FreeBSD.ORG X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on elvis.mu.org X-Spam-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00, SARE_SUB_GAPPY_3 autolearn=no version=3.0.2 X-Spam-Level: Cc: Subject: cvs commit: src/sys/contrib/altq/altq altq_subr.c altq_var.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sun, 03 Jul 2005 01:26:17 -0000 X-Original-Date: Mon, 21 Feb 2005 17:11:09 +0000 (UTC) X-List-Received-Date: Sun, 03 Jul 2005 01:26:17 -0000 mlaier 2005-02-21 17:11:09 UTC FreeBSD src repository Modified files: sys/contrib/altq/altq altq_subr.c altq_var.h Log: Don't use the static CALLOUT_INITIALIZER for __FreeBSD_version >= 600000. It was a bad idea, but since it is done like this in the vendor source we keep it around for older versions. As a safe guard against future misuse we don't even define CALLOUT_INITIALIZER anymore. This fixes ALTQ after callout_init_mtx() and takes altq_var.h off the vendor branch. Submitted by: Divacky Roman (w/ changes) Revision Changes Path 1.6 +7 -0 src/sys/contrib/altq/altq/altq_subr.c 1.2 +2 -1 src/sys/contrib/altq/altq/altq_var.h