Merge branch 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[mv-sheeva.git] / include / asm-parisc / prefetch.h

diff --git a/include/asm-parisc/prefetch.h b/include/asm-parisc/prefetch.h
index f5a2e7ae2662c5e53035a761a0ef354eace08ffd..c5edc60c059f08d0d7b610bdf9793a56db7af0f8 100644 (file)
--- a/include/asm-parisc/prefetch.h
+++ b/include/asm-parisc/prefetch.h
@@ -19,16 +19,19 @@
 #ifdef CONFIG_PREFETCH
 
 #define ARCH_HAS_PREFETCH
-extern inline void prefetch(const void *addr)
+static inline void prefetch(const void *addr)
 {
        __asm__("ldw 0(%0), %%r0" : : "r" (addr));
 }
 
+/* LDD is a PA2.0 addition. */
+#ifdef CONFIG_PA20
 #define ARCH_HAS_PREFETCHW
-extern inline void prefetchw(const void *addr)
+static inline void prefetchw(const void *addr)
 {
        __asm__("ldd 0(%0), %%r0" : : "r" (addr));
 }
+#endif /* CONFIG_PA20 */
 
 #endif /* CONFIG_PREFETCH */
 #endif /* __ASSEMBLY__ */