From owner-cvs-src@FreeBSD.ORG  Mon Aug 15 18:46:14 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5F90616A41F;
	Mon, 15 Aug 2005 18:46:14 +0000 (GMT)
	(envelope-from jkoshy@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B4BB543D6E;
	Mon, 15 Aug 2005 18:46:13 +0000 (GMT)
	(envelope-from jkoshy@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 j7FIkDEp085645;
	Mon, 15 Aug 2005 18:46:13 GMT
	(envelope-from jkoshy@repoman.freebsd.org)
Received: (from jkoshy@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7FIkDoW085644;
	Mon, 15 Aug 2005 18:46:13 GMT (envelope-from jkoshy)
Message-Id: <200508151846.j7FIkDoW085644@repoman.freebsd.org>
From: Joseph Koshy <jkoshy@FreeBSD.org>
Date: Mon, 15 Aug 2005 18:46:13 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/kern kern_pmc.c src/sys/sys pmckern.h
 src/sys/dev/hwpmc hwpmc_mod.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Aug 2005 18:46:14 -0000

jkoshy      2005-08-15 18:46:13 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/kern             kern_pmc.c 
    sys/sys              pmckern.h 
    sys/dev/hwpmc        hwpmc_mod.c 
  Log:
  MFC { sys/dev/hwpmc/hwpmc_mod.c:1.13, sys/kern/kern_pmc.c:1.5,
      sys/sys/pmckern.h:1.5 }
  
  Fail the module loading process if the currently executing kernel
  was not compiled with 'options HWPMC_HOOKS' or if the compiled-in
  version numbers of the kernel and module are not in sync.
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.10.2.3  +12 -0     src/sys/dev/hwpmc/hwpmc_mod.c
  1.4.2.1   +14 -7     src/sys/kern/kern_pmc.c
  1.4.2.1   +3 -0      src/sys/sys/pmckern.h