2003-05-27 09:09:36

by Miles Bader

[permalink] [raw]
Subject: [PATCH][v850] Add __KERNEL__ guard to nb85e_cache.h on v850

This header ends up getting included by uClibc (though nothing in it is
used), so this protection is necessary to avoid problems with kernel-only
typedefs.

diff -ruN -X../cludes linux-2.5.70/include/asm-v850/nb85e_cache.h linux-2.5.70-v850-20030527/include/asm-v850/nb85e_cache.h
--- linux-2.5.70/include/asm-v850/nb85e_cache.h 2003-04-21 10:53:17.000000000 +0900
+++ linux-2.5.70-v850-20030527/include/asm-v850/nb85e_cache.h 2003-05-27 16:09:43.000000000 +0900
@@ -35,7 +35,7 @@
#define L1_CACHE_BYTES NB85E_CACHE_LINE_SIZE


-#ifndef __ASSEMBLY__
+#if defined(__KERNEL__) && !defined(__ASSEMBLY__)

/* Set caching params via the BHC and DCC registers. */
void nb85e_cache_enable (u16 bhc, u16 dcc);
@@ -73,6 +74,6 @@
#define flush_icache_user_range nb85e_cache_flush_icache_user_range
#define flush_cache_sigtramp nb85e_cache_flush_sigtramp

-#endif /* !__ASSEMBLY__ */
+#endif /* __KERNEL__ && !__ASSEMBLY__ */

#endif /* __V850_NB85E_CACHE_H__ */