From 47ab1f02e9d722213bb0c7839ed30011c2fb456d Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 30 Jan 2008 23:27:58 +0100 Subject: [PATCH] --- yaml --- r: 80965 b: refs/heads/master c: ab6e14b712e2d8e0c4dd3cf1a72083b52104853a h: refs/heads/master i: 80963: 2160e16db73fdb72f9783191356db2b43cb9b947 v: v3 --- [refs] | 2 +- trunk/include/asm-ia64/percpu.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2a2b6453ec2d..57c6be3bb761 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18fbef9e5242e146fe0264cf719a498785102841 +refs/heads/master: ab6e14b712e2d8e0c4dd3cf1a72083b52104853a diff --git a/trunk/include/asm-ia64/percpu.h b/trunk/include/asm-ia64/percpu.h index 26404b77f007..77f30b664b4e 100644 --- a/trunk/include/asm-ia64/percpu.h +++ b/trunk/include/asm-ia64/percpu.h @@ -15,18 +15,20 @@ #include +#ifdef CONFIG_SMP + #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) extern void *per_cpu_init(void); #else /* ! SMP */ +#define PER_CPU_ATTRIBUTES __attribute__((__section__(".data.percpu"))) + #define per_cpu_init() (__phys_per_cpu_start) #endif /* SMP */