Re: x86/non-x86: percpu, node ids, apic ids x86.git fixup

Ingo Molnar
2008-01-30T19:31:32Z

* Mike Travis <travis@sgi.com> wrote:

> Could this be a problem with:
>
> #ifdef HAVE_MODEL_SMALL_ATTRIBUTE
> # define PER_CPU_ATTRIBUTES __attribute__((__model__ (__small__)))
> #endif
>
> This is only defined for !__ASSEMBLY__

nope, moving that per the patch below did not resolve the link problems.

Ingo

-------------->
Subject: ia64: build fix #3
From: Ingo Molnar <mingo@elte.hu>

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
include/asm-ia64/percpu.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Index: linux-x86.q/include/asm-ia64/percpu.h
===================================================================
--- linux-x86.q.orig/include/asm-ia64/percpu.h
+++ linux-x86.q/include/asm-ia64/percpu.h
@@ -8,6 +8,10 @@

#define PERCPU_ENOUGH_ROOM PERCPU_PAGE_SIZE

+#ifdef HAVE_MODEL_SMALL_ATTRIBUTE
+# define PER_CPU_ATTRIBUTES __attribute__((__model__ (__small__)))
+#endif
+
#ifdef __ASSEMBLY__
# define THIS_CPU(var) (per_cpu__##var) /* use this to mark accesses to per-CPU variables... */
#else /* !__ASSEMBLY__ */
@@ -15,10 +19,6 @@

#include <linux/threads.h>

-#ifdef HAVE_MODEL_SMALL_ATTRIBUTE
-# define PER_CPU_ATTRIBUTES __attribute__((__model__ (__small__)))
-#endif
-
#ifdef CONFIG_SMP

#define __my_cpu_offset __ia64_per_cpu_var(local_per_cpu_offset)