From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 17 14:45:58 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CDF5810656A5;
	Wed, 17 Jun 2009 14:45:58 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BAFCC8FC19;
	Wed, 17 Jun 2009 14:45:58 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HEjwg3078775;
	Wed, 17 Jun 2009 14:45:58 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HEjwb9078773;
	Wed, 17 Jun 2009 14:45:58 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906171445.n5HEjwb9078773@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 17 Jun 2009 14:45:58 +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: r194365 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	modules/linux
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2009 14:45:59 -0000

Author: des
Date: Wed Jun 17 14:45:58 2009
New Revision: 194365
URL: http://svn.freebsd.org/changeset/base/194365

Log:
  merge r192852, r192855: opt_apic.h is only used on i386.

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/modules/linux/Makefile

Modified: stable/7/sys/modules/linux/Makefile
==============================================================================
--- stable/7/sys/modules/linux/Makefile	Wed Jun 17 14:32:08 2009	(r194364)
+++ stable/7/sys/modules/linux/Makefile	Wed Jun 17 14:45:58 2009	(r194365)
@@ -17,7 +17,10 @@ SRCS=	linux${SFX}_dummy.c linux_emul.c l
 	device_if.h bus_if.h assym.s
 
 # XXX: for assym.s
-SRCS+=  opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h opt_hwpmc_hooks.h
+SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
+.if ${MACHINE_ARCH} == "i386"
+SRCS+=	opt_apic.h
+.endif
 
 OBJS=	linux${SFX}_locore.o linux${SFX}_support.o