---

yaml --- r: 71032 b: refs/heads/master c: 9bfa23d h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · 5569bc2 · 5569bc2
1 parent 8c2b5ed
commit 5569bc2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 45 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2bba72c10cdd907f73c57c8bdeb3354f8c233c6
+refs/heads/master: 9bfa23df5632775bcb70b87975743046a71f7a3b
diff --git a/trunk/include/asm-x86/cache.h b/trunk/include/asm-x86/cache.h
@@ -1,5 +1,20 @@
-#ifdef CONFIG_X86_32
-# include "cache_32.h"
-#else
-# include "cache_64.h"
+#ifndef _ARCH_X86_CACHE_H
+#define _ARCH_X86_CACHE_H
+
+/* L1 cache line size */
+#define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)
+#define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
+
+#define __read_mostly __attribute__((__section__(".data.read_mostly")))
+
+#ifdef CONFIG_X86_VSMP
+/* vSMP Internode cacheline shift */
+#define INTERNODE_CACHE_SHIFT (12)
+#ifdef CONFIG_SMP
+#define __cacheline_aligned_in_smp					\
+	__attribute__((__aligned__(1 << (INTERNODE_CACHE_SHIFT))))	\
+	__attribute__((__section__(".data.page_aligned")))
+#endif
+#endif
+
 #endif
diff --git a/trunk/include/asm-x86/cache_32.h b/trunk/include/asm-x86/cache_32.h
diff --git a/trunk/include/asm-x86/cache_64.h b/trunk/include/asm-x86/cache_64.h