[Xen-changelog] [xen-unstable] [IA64] add the definition of __cacheline_aligned and its variants

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID f7132169c2bf453db85f40b4041380f387b74082
# Parent  75b4a0ff27b85c5e958f4e8b4854d272f01f1955
[IA64] add the definition of __cacheline_aligned and its variants

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/include/asm-ia64/config.h |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff -r 75b4a0ff27b8 -r f7132169c2bf xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     Mon Jul 03 09:01:36 2006 -0600
+++ b/xen/include/asm-ia64/config.h     Mon Jul 03 09:11:49 2006 -0600
@@ -139,17 +139,19 @@ extern int smp_num_siblings;
 #define platform_outw  __ia64_outw
 #define platform_outl  __ia64_outl
 
-// FIXME: This just overrides a use in a typedef (not allowed in ia64,
-//  or maybe just in older gcc's?) used in timer.c but should be OK
-//  (and indeed is probably required!) elsewhere
-#undef __cacheline_aligned
-#undef ____cacheline_aligned
-#undef ____cacheline_aligned_in_smp
-#define __cacheline_aligned
+#include <xen/cache.h>
+#ifndef CONFIG_SMP
 #define __cacheline_aligned_in_smp
-#define ____cacheline_aligned
+#else
+#define __cacheline_aligned_in_smp __cacheline_aligned
+#endif
+
+#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
+#ifndef CONFIG_SMP
 #define ____cacheline_aligned_in_smp
-#define ____cacheline_maxaligned_in_smp
+#else
+#define ____cacheline_aligned_in_smp ____cacheline_aligned
+#endif
 
 #ifndef __ASSEMBLY__
 #include "asm/types.h" // for u64

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog