From owner-svn-src-stable-10@FreeBSD.ORG Mon Apr 27 05:42:15 2015 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6B29A1C; Mon, 27 Apr 2015 05:42:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9482F1161; Mon, 27 Apr 2015 05:42:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R5gF4E022762; Mon, 27 Apr 2015 05:42:15 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R5gFdN022761; Mon, 27 Apr 2015 05:42:15 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504270542.t3R5gFdN022761@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 27 Apr 2015 05:42:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r282050 - stable/10/sys/contrib/x86emu X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 05:42:15 -0000 Author: delphij Date: Mon Apr 27 05:42:14 2015 New Revision: 282050 URL: https://svnweb.freebsd.org/changeset/base/282050 Log: MFC r281502: Sync with OpenBSD: Use volatile instead of __volatile__. Modified: stable/10/sys/contrib/x86emu/x86emu.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/contrib/x86emu/x86emu.c ============================================================================== --- stable/10/sys/contrib/x86emu/x86emu.c Mon Apr 27 01:36:16 2015 (r282049) +++ stable/10/sys/contrib/x86emu/x86emu.c Mon Apr 27 05:42:14 2015 (r282050) @@ -1,4 +1,4 @@ -/* $OpenBSD: x86emu.c,v 1.5 2010/02/17 15:09:47 pirofti Exp $ */ +/* $OpenBSD: x86emu.c,v 1.9 2014/06/15 11:04:49 pirofti Exp $ */ /* $NetBSD: x86emu.c,v 1.7 2009/02/03 19:26:29 joerg Exp $ */ /* @@ -5250,7 +5250,7 @@ x86emuOp2_pop_FS(struct x86emu *emu) static void hw_cpuid(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) { - __asm__ __volatile__("cpuid" + __asm__ volatile("cpuid" : "=a" (*a), "=b" (*b), "=c" (*c), "=d" (*d) : "a" (*a), "c" (*c)