svn commit: r189886 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb security/audit

[Robert Watson]

Author: rwatson
Date: Mon Mar 16 16:57:04 2009
New Revision: 189886
URL: http://svn.freebsd.org/changeset/base/189886

Log:
  Merge r174894 from head to stable/7:
  
    Change "audit_pipe_preselect" to "audit_pipe_presel" to make it print
    with proper alignment in ddb(4) and vmstat(8).

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/security/audit/audit_pipe.c

Modified: stable/7/sys/security/audit/audit_pipe.c
==============================================================================
--- stable/7/sys/security/audit/audit_pipe.c	Mon Mar 16 16:55:05 2009	(r189885)
+++ stable/7/sys/security/audit/audit_pipe.c	Mon Mar 16 16:57:04 2009	(r189886)
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
 static MALLOC_DEFINE(M_AUDIT_PIPE, "audit_pipe", "Audit pipes");
 static MALLOC_DEFINE(M_AUDIT_PIPE_ENTRY, "audit_pipeent",
     "Audit pipe entries and buffers");
-static MALLOC_DEFINE(M_AUDIT_PIPE_PRESELECT, "audit_pipe_preselect",
+static MALLOC_DEFINE(M_AUDIT_PIPE_PRESELECT, "audit_pipe_presel",
     "Audit pipe preselection structure");
 
 /*