summaryrefslogtreecommitdiffstats
path: root/include
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
parent7c3dbbe982ac85837f1da150ea9539a9e9a12557 (diff)
parentdc86e88c2bb8a7603ee175fbb6a9e92cf3293dd8 (diff)
downloadlinux-48ea753075aa15699bd5fac26faa08431aaa697b.tar.gz
linux-48ea753075aa15699bd5fac26faa08431aaa697b.tar.bz2
linux-48ea753075aa15699bd5fac26faa08431aaa697b.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/delay.h10
-rw-r--r--include/linux/cache.h2
2 files changed, 2 insertions, 10 deletions
diff --git a/include/asm-ia64/delay.h b/include/asm-ia64/delay.h
index 57182d6f2b9a..bba702076391 100644
--- a/include/asm-ia64/delay.h
+++ b/include/asm-ia64/delay.h
@@ -84,14 +84,6 @@ __delay (unsigned long loops)
ia64_delay_loop (loops - 1);
}
-static __inline__ void
-udelay (unsigned long usecs)
-{
- unsigned long start = ia64_get_itc();
- unsigned long cycles = usecs*local_cpu_data->cyc_per_usec;
-
- while (ia64_get_itc() - start < cycles)
- cpu_relax();
-}
+extern void udelay (unsigned long usecs);
#endif /* _ASM_IA64_DELAY_H */
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