From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Date: Wed, 30 Jan 2008 19:30:39 +0000 Subject: Re: x86/non-x86: percpu, node ids, apic ids x86.git fixup Message-Id: <20080130193039.GB11506@elte.hu> List-Id: References: <200801301414.m0UEEgCC006371@hera.kernel.org> <47A09F8A.3000309@sgi.com> <20080130161036.GA12293@elte.hu> <1FE6DD409037234FAB833C420AA843EC757C72@orsmsx424.amr.corp.intel.com> <20080130180623.GA24881@elte.hu> <1FE6DD409037234FAB833C420AA843EC757DEA@orsmsx424.amr.corp.intel.com> <47A0CD4B.5040706@sgi.com> In-Reply-To: <47A0CD4B.5040706@sgi.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Mike Travis Cc: "Luck, Tony" , Geert Uytterhoeven , Linus Torvalds , Thomas Gleixner , Linux Kernel Development , Linux/PPC Development , linux-ia64@vger.kernel.org, sparclinux@vger.kernel.org * Mike Travis 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 Signed-off-by: Ingo Molnar --- 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 -#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)