1.1 --- a/xen/include/asm-ia64/config.h	Mon Jul 03 09:01:36 2006 -0600
     1.2 +++ b/xen/include/asm-ia64/config.h	Mon Jul 03 09:11:49 2006 -0600
     1.3 @@ -139,17 +139,19 @@ extern int smp_num_siblings;
     1.4  #define platform_outw	__ia64_outw
     1.5  #define platform_outl	__ia64_outl
     1.6  
     1.7 -// FIXME: This just overrides a use in a typedef (not allowed in ia64,
     1.8 -//  or maybe just in older gcc's?) used in timer.c but should be OK
     1.9 -//  (and indeed is probably required!) elsewhere
    1.10 -#undef __cacheline_aligned
    1.11 -#undef ____cacheline_aligned
    1.12 -#undef ____cacheline_aligned_in_smp
    1.13 -#define __cacheline_aligned
    1.14 +#include <xen/cache.h>
    1.15 +#ifndef CONFIG_SMP
    1.16  #define __cacheline_aligned_in_smp
    1.17 -#define ____cacheline_aligned
    1.18 +#else
    1.19 +#define __cacheline_aligned_in_smp __cacheline_aligned
    1.20 +#endif
    1.21 +
    1.22 +#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
    1.23 +#ifndef CONFIG_SMP
    1.24  #define ____cacheline_aligned_in_smp
    1.25 -#define ____cacheline_maxaligned_in_smp
    1.26 +#else
    1.27 +#define ____cacheline_aligned_in_smp ____cacheline_aligned
    1.28 +#endif
    1.29  
    1.30  #ifndef __ASSEMBLY__
    1.31  #include "asm/types.h"	// for u64