diff options
author | rwatson <rwatson@FreeBSD.org> | 2009-04-20 12:59:23 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2009-04-20 12:59:23 +0000 |
commit | 21a8b350dc7ca2485c627342a0cfab0791b1cd45 (patch) | |
tree | f5c7486cc0c69aef8fc84d1f077627857e581db9 /sys | |
parent | a780a09a2b78068eb257ee0108e556be3c191053 (diff) | |
download | FreeBSD-src-21a8b350dc7ca2485c627342a0cfab0791b1cd45.zip FreeBSD-src-21a8b350dc7ca2485c627342a0cfab0791b1cd45.tar.gz |
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
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/include/param.h | 2 | ||||
-rw-r--r-- | sys/arm/include/param.h | 2 | ||||
-rw-r--r-- | sys/i386/include/param.h | 2 | ||||
-rw-r--r-- | sys/ia64/include/param.h | 4 | ||||
-rw-r--r-- | sys/mips/include/param.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/param.h | 2 | ||||
-rw-r--r-- | sys/sparc64/include/param.h | 4 | ||||
-rw-r--r-- | sys/sun4v/include/param.h | 4 |
8 files changed, 3 insertions, 19 deletions
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index 16c30ad..842e8bb 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -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 */ diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h index 4a83e27..802390b 100644 --- a/sys/arm/include/param.h +++ b/sys/arm/include/param.h @@ -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 diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index abf855d..3c22c7c 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -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) */ diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h index 4130ec4..f59c408 100644 --- a/sys/ia64/include/param.h +++ b/sys/ia64/include/param.h @@ -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 diff --git a/sys/mips/include/param.h b/sys/mips/include/param.h index af1e06f..ea599d1 100644 --- a/sys/mips/include/param.h +++ b/sys/mips/include/param.h @@ -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 */ diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h index cab873e..a9142c6 100644 --- a/sys/powerpc/include/param.h +++ b/sys/powerpc/include/param.h @@ -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 diff --git a/sys/sparc64/include/param.h b/sys/sparc64/include/param.h index b909971..f09a6cd 100644 --- a/sys/sparc64/include/param.h +++ b/sys/sparc64/include/param.h @@ -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 diff --git a/sys/sun4v/include/param.h b/sys/sun4v/include/param.h index aca3c37..e42abf5 100644 --- a/sys/sun4v/include/param.h +++ b/sys/sun4v/include/param.h @@ -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 |