From owner-p4-projects@FreeBSD.ORG  Wed May 13 04:26:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 81E711065676; Wed, 13 May 2009 04:26:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4246E1065675
	for <perforce@FreeBSD.org>; Wed, 13 May 2009 04:26:17 +0000 (UTC)
	(envelope-from antab@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 30D998FC18
	for <perforce@FreeBSD.org>; Wed, 13 May 2009 04:26:17 +0000 (UTC)
	(envelope-from antab@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4D4QHls029302
	for <perforce@FreeBSD.org>; Wed, 13 May 2009 04:26:17 GMT
	(envelope-from antab@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4D4QHYj029300
	for perforce@freebsd.org; Wed, 13 May 2009 04:26:17 GMT
	(envelope-from antab@FreeBSD.org)
Date: Wed, 13 May 2009 04:26:17 GMT
Message-Id: <200905130426.n4D4QHYj029300@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	antab@FreeBSD.org using -f
From: Arnar Mar Sig <antab@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 162005 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2009 04:26:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=162005

Change 162005 by antab@antab_farm on 2009/05/13 04:26:09

	* Define CACHE_LINE_SHIFT and CACHE_LINE_SIZE
	* Remove opt_kdb.h include

Affected files ...

.. //depot/projects/avr32/src/libexec/rtld-elf/avr32/rtld_machdep.h#2 edit
.. //depot/projects/avr32/src/sys/avr32/include/asm.h#6 edit
.. //depot/projects/avr32/src/sys/avr32/include/param.h#4 edit

Differences ...

==== //depot/projects/avr32/src/libexec/rtld-elf/avr32/rtld_machdep.h#2 (text+ko) ====

@@ -32,8 +32,6 @@
 #include <sys/types.h>
 #include <machine/atomic.h>
 
-#define CACHE_LINE_SIZE	  32
-
 struct Struct_Obj_Entry;
 
 /* Return the address of the .dynamic section in the dynamic linker. */

==== //depot/projects/avr32/src/sys/avr32/include/asm.h#6 (text+ko) ====

@@ -37,7 +37,6 @@
 #ifndef _MACHINE_ASM_H_
 #define	_MACHINE_ASM_H_
 
-#include "opt_kdb.h"
 #include <sys/cdefs.h>
 
 #define GLOBAL(sym)	.globl sym;		\

==== //depot/projects/avr32/src/sys/avr32/include/param.h#4 (text+ko) ====

@@ -72,6 +72,13 @@
 #define	ALIGNBYTES	_ALIGNBYTES
 #define	ALIGN(p)	_ALIGN(p)
 
+/*
+ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
+ * architecture.  It should be used with appropriate caution.
+ */
+#define CACHE_LINE_SHIFT        5
+#define CACHE_LINE_SIZE         (1 << CACHE_LINE_SHIFT)
+
 #define	PAGE_SHIFT	12
 #define	PAGE_SIZE	(1 << PAGE_SHIFT)	/* Page size */
 #define	PAGE_MASK	(PAGE_SIZE - 1)