From owner-svn-src-all@FreeBSD.ORG Mon Apr 20 12:59:24 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FD1B10656AE; Mon, 20 Apr 2009 12:59:24 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6C7DC8FC15; Mon, 20 Apr 2009 12:59:24 +0000 (UTC) (envelope-from rwatson@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 n3KCxOXd046746; Mon, 20 Apr 2009 12:59:24 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3KCxO9F046738; Mon, 20 Apr 2009 12:59:24 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200904201259.n3KCxO9F046738@svn.freebsd.org> From: Robert Watson Date: Mon, 20 Apr 2009 12:59:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191309 - in head/sys: amd64/include arm/include i386/include ia64/include mips/include powerpc/include sparc64/include sun4v/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2009 12:59:25 -0000 Author: rwatson Date: Mon Apr 20 12:59:23 2009 New Revision: 191309 URL: http://svn.freebsd.org/changeset/base/191309 Log: Don't conditionally define CACHE_LINE_SHIFT, as we anticipate sizing a fair number of static data structures, making this an unlikely option to try to change without also changing source code. [1] Change default cache line size on ia64, sparc64, and sun4v to 128 bytes, as this was what rtld-elf was already using on those platforms. [2] Suggested by: bde [1], jhb [2] MFC after: 2 weeks Modified: head/sys/amd64/include/param.h head/sys/arm/include/param.h head/sys/i386/include/param.h head/sys/ia64/include/param.h head/sys/mips/include/param.h head/sys/powerpc/include/param.h head/sys/sparc64/include/param.h head/sys/sun4v/include/param.h Modified: head/sys/amd64/include/param.h ============================================================================== --- head/sys/amd64/include/param.h Mon Apr 20 12:43:07 2009 (r191308) +++ head/sys/amd64/include/param.h Mon Apr 20 12:59:23 2009 (r191309) @@ -93,9 +93,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#ifndef CACHE_LINE_SHIFT #define CACHE_LINE_SHIFT 6 -#endif #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) /* Size of the level 1 page table units */ Modified: head/sys/arm/include/param.h ============================================================================== --- head/sys/arm/include/param.h Mon Apr 20 12:43:07 2009 (r191308) +++ head/sys/arm/include/param.h Mon Apr 20 12:59:23 2009 (r191309) @@ -85,9 +85,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#ifndef CACHE_LINE_SHIFT #define CACHE_LINE_SHIFT 6 -#endif #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) #define PAGE_SHIFT 12 Modified: head/sys/i386/include/param.h ============================================================================== --- head/sys/i386/include/param.h Mon Apr 20 12:43:07 2009 (r191308) +++ head/sys/i386/include/param.h Mon Apr 20 12:59:23 2009 (r191309) @@ -78,9 +78,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#ifndef CACHE_LINE_SHIFT #define CACHE_LINE_SHIFT 6 -#endif #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) #define PAGE_SHIFT 12 /* LOG2(PAGE_SIZE) */ Modified: head/sys/ia64/include/param.h ============================================================================== --- head/sys/ia64/include/param.h Mon Apr 20 12:43:07 2009 (r191308) +++ head/sys/ia64/include/param.h Mon Apr 20 12:59:23 2009 (r191309) @@ -103,9 +103,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#ifndef CACHE_LINE_SHIFT -#define CACHE_LINE_SHIFT 6 -#endif +#define CACHE_LINE_SHIFT 7 #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) #ifndef LOG2_PAGE_SIZE Modified: head/sys/mips/include/param.h ============================================================================== --- head/sys/mips/include/param.h Mon Apr 20 12:43:07 2009 (r191308) +++ head/sys/mips/include/param.h Mon Apr 20 12:59:23 2009 (r191309) @@ -93,9 +93,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#ifndef CACHE_LINE_SHIFT #define CACHE_LINE_SHIFT 6 -#endif #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) #define NBPG 4096 /* bytes/page */ Modified: head/sys/powerpc/include/param.h ============================================================================== --- head/sys/powerpc/include/param.h Mon Apr 20 12:43:07 2009 (r191308) +++ head/sys/powerpc/include/param.h Mon Apr 20 12:59:23 2009 (r191309) @@ -83,9 +83,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#ifndef CACHE_LINE_SHIFT #define CACHE_LINE_SHIFT 7 -#endif #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) #define PAGE_SHIFT 12 Modified: head/sys/sparc64/include/param.h ============================================================================== --- head/sys/sparc64/include/param.h Mon Apr 20 12:43:07 2009 (r191308) +++ head/sys/sparc64/include/param.h Mon Apr 20 12:59:23 2009 (r191309) @@ -75,9 +75,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#ifndef CACHE_LINE_SHIFT -#define CACHE_LINE_SHIFT 6 -#endif +#define CACHE_LINE_SHIFT 7 #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) #define PAGE_SHIFT_8K 13 Modified: head/sys/sun4v/include/param.h ============================================================================== --- head/sys/sun4v/include/param.h Mon Apr 20 12:43:07 2009 (r191308) +++ head/sys/sun4v/include/param.h Mon Apr 20 12:59:23 2009 (r191309) @@ -75,9 +75,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#ifndef CACHE_LINE_SHIFT -#define CACHE_LINE_SHIFT 6 -#endif +#define CACHE_LINE_SHIFT 7 #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) #define PAGE_SHIFT_8K 13