From owner-svn-src-stable@freebsd.org  Sat Jun 18 12:44:15 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DAFBCA7849F;
 Sat, 18 Jun 2016 12:44:15 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A7BA914D1;
 Sat, 18 Jun 2016 12:44:15 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5ICiESE043900;
 Sat, 18 Jun 2016 12:44:14 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5ICiEHX043899;
 Sat, 18 Jun 2016 12:44:14 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201606181244.u5ICiEHX043899@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
 using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 18 Jun 2016 12:44:14 +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: r302006 - stable/10/sys/sys
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@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jun 2016 12:44:16 -0000

Author: ed
Date: Sat Jun 18 12:44:14 2016
New Revision: 302006
URL: https://svnweb.freebsd.org/changeset/base/302006

Log:
  MFC r301406:
  
    Don't test for INKERNEL to check whether we're in kernel space.
  
    It turns out that <machine/param.h> actually defines a macro under this
    name, even when we're not in kernelspace. This causes us to suppress
    some macro definitions that are used by userspace apps.
  
  PR:		210026
  Reported by:	jbeich@

Modified:
  stable/10/sys/sys/soundcard.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/soundcard.h
==============================================================================
--- stable/10/sys/sys/soundcard.h	Sat Jun 18 12:42:49 2016	(r302005)
+++ stable/10/sys/sys/soundcard.h	Sat Jun 18 12:44:14 2016	(r302006)
@@ -1261,7 +1261,7 @@ typedef struct mixer_info {
  */
 #define LOCL_STARTAUDIO		1
 
-#if (!defined(_KERNEL) && !defined(INKERNEL)) || defined(USE_SEQ_MACROS)
+#if !defined(_KERNEL) || defined(USE_SEQ_MACROS)
 /*
  *	Some convenience macros to simplify programming of the
  *	/dev/sequencer interface