aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-16 14:43:57 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-16 14:43:57 -0800
commit48ea753075aa15699bd5fac26faa08431aaa697b (patch)
tree4ce1b1890dc687cb1cf77f98e7a95b94c7ef3a93 /include/linux
parent[PATCH] ppc: ppc4xx_dma DMA_MODE_{READ,WRITE} fix (diff)
parent[IA64] Add __read_mostly support for IA64 (diff)
downloadlinux-dev-48ea753075aa15699bd5fac26faa08431aaa697b.tar.xz
linux-dev-48ea753075aa15699bd5fac26faa08431aaa697b.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cache.h b/include/linux/cache.h
index f6b5a46c5f82..0b7ecf3af78a 100644
--- a/include/linux/cache.h
+++ b/include/linux/cache.h
@@ -13,7 +13,7 @@
#define SMP_CACHE_BYTES L1_CACHE_BYTES
#endif
-#if defined(CONFIG_X86) || defined(CONFIG_SPARC64)
+#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64)
#define __read_mostly __attribute__((__section__(".data.read_mostly")))
#else
#define __read_mostly