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 _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
