Skip to contentSkip to conversation

Blackfin arch: cleanup cache header file

PATCH In review Wu, Bryan 2 participants 2 messages Mar 26, 2007

lore
Share & tools
lore

Wu, Bryan

author
#0 lore raw

PATCH 1/1 Blackfin arch: cleanup cache header file

Hi folks,

According to Paul's review, this patch cleanup the include/asm-blackfin/cache.h comments.

---

 include/asm-blackfin/cache.h |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
include/asm-blackfin/cache.h +14 -6
Index: linux-2.6/include/asm-blackfin/cache.h
===================================================================
@@ -1,13 +1,21 @@
+/*
+ * include/asm-blackfin/cache.h
+ */
 #ifndef __ARCH_BLACKFIN_CACHE_H
 #define __ARCH_BLACKFIN_CACHE_H
 
-/* bytes per L1 cache line */
-#define        L1_CACHE_SHIFT  5	/* BlackFin loads 32 bytes for cache */
-#define        L1_CACHE_BYTES  (1 << L1_CACHE_SHIFT)
+/*
+ * Bytes per L1 cache line
+ * Blackfin loads 32 bytes for cache
+ */
+#define L1_CACHE_SHIFT	5
+#define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
 
-/* For speed we do need to align these ...MaTed---*/
-/*  But include/linux/cache.h does this for us if we DO not define ...MaTed---*/
-#define __cacheline_aligned	/***** maybe no need this   Tony *****/
+/*
+ * Don't make __cacheline_aligned and
+ * ____cacheline_aligned defined in include/linux/cache.h
+ */
+#define __cacheline_aligned
 #define ____cacheline_aligned
 
 /*

_

Thanks
-Bryan

#1 lore raw

include/asm-blackfin/cache.h line 19

Quoted 13 lines · Bryan
include/asm-blackfin/cache.h +7 -3
+#define L1_CACHE_SHIFT	5
+#define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
 
-/* For speed we do need to align these ...MaTed---*/
-/*  But include/linux/cache.h does this for us if we DO not define ...MaTed---*/
-#define __cacheline_aligned	/***** maybe no need this   Tony *****/
+/*
+ * Don't make __cacheline_aligned and
+ * ____cacheline_aligned defined in include/linux/cache.h
+ */
+#define __cacheline_aligned
 #define ____cacheline_aligned

You still don't need this. Ancient versions of gcc had problems with the attribute, but it's not even possible to build the kernel with those anymore. Please remove these and try again. You can simply alias SMP_CACHE_BYTES to L1_CACHE_BYTES if you've left this in due to the resulting build failure.

m68knommu seems to be another user that never got cleaned up, perhaps it's a good time to kill that off too..