From owner-svn-soc-all@FreeBSD.ORG  Tue Sep  2 19:04:05 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AB0778EE
 for <svn-soc-all@FreeBSD.org>; Tue,  2 Sep 2014 19:04:05 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 96D7B14ED
 for <svn-soc-all@FreeBSD.org>; Tue,  2 Sep 2014 19:04:05 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s82J45k0031233
 for <svn-soc-all@FreeBSD.org>; Tue, 2 Sep 2014 19:04:05 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s82J453K031176
 for svn-soc-all@FreeBSD.org; Tue, 2 Sep 2014 19:04:05 GMT
 (envelope-from op@FreeBSD.org)
Date: Tue, 2 Sep 2014 19:04:05 GMT
Message-Id: <201409021904.s82J453K031176@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org
 using -f
From: op@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r273495 - soc2014/op/freebsd-base/sys/x86/include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Sep 2014 19:04:05 -0000

Author: op
Date: Tue Sep  2 19:04:04 2014
New Revision: 273495
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=273495

Log:
  SMAP: fix build world
  
  Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
  
  git: https://github.com/opntr/opBSD/tree/op/gsoc2014/smap+kpatch

Modified:
  soc2014/op/freebsd-base/sys/x86/include/selfpatch-asmacros.h

Modified: soc2014/op/freebsd-base/sys/x86/include/selfpatch-asmacros.h
==============================================================================
--- soc2014/op/freebsd-base/sys/x86/include/selfpatch-asmacros.h	Tue Sep  2 18:57:19 2014	(r273494)
+++ soc2014/op/freebsd-base/sys/x86/include/selfpatch-asmacros.h	Tue Sep  2 19:04:04 2014	(r273495)
@@ -30,7 +30,9 @@
 #ifndef	__X86_SELFPATCH_ASMACROS_H__
 #define	__X86_SELFPATCH_ASMACROS_H__
 
+#ifdef _KERNEL
 #include "opt_cpu.h"
+#endif
 
 #define KSP_CPUID		1
 #define KSP_CPUID2		2