From owner-svn-src-all@FreeBSD.ORG  Sun Mar 14 13:32:41 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 13A1B106567D;
	Sun, 14 Mar 2010 13:32:41 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 033378FC18;
	Sun, 14 Mar 2010 13:32:41 +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 o2EDWexx053781;
	Sun, 14 Mar 2010 13:32:40 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2EDWeqG053779;
	Sun, 14 Mar 2010 13:32:40 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201003141332.o2EDWeqG053779@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 14 Mar 2010 13:32:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205152 - stable/7/sys/compat/linprocfs
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Mar 2010 13:32:41 -0000

Author: gavin
Date: Sun Mar 14 13:32:40 2010
New Revision: 205152
URL: http://svn.freebsd.org/changeset/base/205152

Log:
  Merge r183385 from head (by cognet)
  
    Advertise bit 26 as sse2.
  
  PR:		kern/130724
  Approved by:	cognet

Modified:
  stable/7/sys/compat/linprocfs/linprocfs.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- stable/7/sys/compat/linprocfs/linprocfs.c	Sun Mar 14 13:29:09 2010	(r205151)
+++ stable/7/sys/compat/linprocfs/linprocfs.c	Sun Mar 14 13:32:40 2010	(r205152)
@@ -222,7 +222,7 @@ linprocfs_docpuinfo(PFS_FILL_ARGS)
 		"sep",	    "sep",     "mtrr",	   "pge",      "mca",
 		"cmov",	    "pat",     "pse36",	   "pn",       "b19",
 		"b20",	    "b21",     "mmxext",   "mmx",      "fxsr",
-		"xmm",	    "b26",     "b27",	   "b28",      "b29",
+		"xmm",	    "sse2",    "b27",	   "b28",      "b29",
 		"3dnowext", "3dnow"
 	};