From: Christoph Lameter <clameter@sgi.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org,
tony.luck@intel.com
Subject: [patch 09/10] ia64: Use generic percpu
Date: Wed, 28 Nov 2007 13:09:35 -0800 [thread overview]
Message-ID: <20071128211528.090929484@sgi.com> (raw)
In-Reply-To: 20071128210926.008783214@sgi.com
[-- Attachment #1: ia64_generic_percpu --]
[-- Type: text/plain, Size: 3128 bytes --]
V1->V2:
- Merge fixes
- Remove transitional check for PER_CPU_ATTRIBUTES from linux/percpu.h
ia64 has a special processor specific mapping that can be used to locate the
offset for the current per cpu area.
Cc: linux-ia64@vger.kernel.org
Cc: tony.luck@intel.com
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
include/asm-ia64/percpu.h | 25 +++++++------------------
include/linux/percpu.h | 4 ----
2 files changed, 7 insertions(+), 22 deletions(-)
Index: linux-2.6.24-rc3-mm2/include/asm-ia64/percpu.h
===================================================================
--- linux-2.6.24-rc3-mm2.orig/include/asm-ia64/percpu.h 2007-11-28 12:51:42.448213150 -0800
+++ linux-2.6.24-rc3-mm2/include/asm-ia64/percpu.h 2007-11-28 12:52:04.955963258 -0800
@@ -12,36 +12,20 @@
# define THIS_CPU(var) (per_cpu__##var) /* use this to mark accesses to per-CPU variables... */
#else /* !__ASSEMBLY__ */
-
#include <linux/threads.h>
#ifdef HAVE_MODEL_SMALL_ATTRIBUTE
# define PER_CPU_ATTRIBUTES __attribute__((__model__ (__small__)))
#endif
-#define DECLARE_PER_CPU(type, name) \
- extern PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name
-
#ifdef CONFIG_SMP
-extern unsigned long __per_cpu_offset[NR_CPUS];
-#define per_cpu_offset(x) (__per_cpu_offset[x])
-
-/* Equal to __per_cpu_offset[smp_processor_id()], but faster to access: */
-DECLARE_PER_CPU(unsigned long, local_per_cpu_offset);
-
-#define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset[cpu]))
-#define __get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __ia64_per_cpu_var(local_per_cpu_offset)))
-#define __raw_get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __ia64_per_cpu_var(local_per_cpu_offset)))
+#define __my_cpu_offset __ia64_per_cpu_var(local_per_cpu_offset)
-extern void setup_per_cpu_areas (void);
extern void *per_cpu_init(void);
#else /* ! SMP */
-#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var))
-#define __get_cpu_var(var) per_cpu__##var
-#define __raw_get_cpu_var(var) per_cpu__##var
#define per_cpu_init() (__phys_per_cpu_start)
#endif /* SMP */
@@ -52,7 +36,12 @@ extern void *per_cpu_init(void);
* On the positive side, using __ia64_per_cpu_var() instead of __get_cpu_var() is slightly
* more efficient.
*/
-#define __ia64_per_cpu_var(var) (per_cpu__##var)
+#define __ia64_per_cpu_var(var) per_cpu__##var
+
+#include <asm-generic/percpu.h>
+
+/* Equal to __per_cpu_offset[smp_processor_id()], but faster to access: */
+DECLARE_PER_CPU(unsigned long, local_per_cpu_offset);
#endif /* !__ASSEMBLY__ */
Index: linux-2.6.24-rc3-mm2/include/linux/percpu.h
===================================================================
--- linux-2.6.24-rc3-mm2.orig/include/linux/percpu.h 2007-11-28 12:51:42.448213150 -0800
+++ linux-2.6.24-rc3-mm2/include/linux/percpu.h 2007-11-28 12:52:04.955963258 -0800
@@ -9,10 +9,6 @@
#include <asm/percpu.h>
-#ifndef PER_CPU_ATTRIBUTES
-#define PER_CPU_ATTRIBUTES
-#endif
-
#define DEFINE_PER_CPU(type, name) \
__attribute__((__section__(".data.percpu"))) \
PER_CPU_ATTRIBUTES __typeof__(type) per_cpu__##name
--
next prev parent reply other threads:[~2007-11-28 21:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-28 21:09 [patch 00/10] Per cpu code simplification V2 Christoph Lameter
2007-11-28 21:09 ` [patch 01/10] percpu: Use a kconfig variable to signal arch specific percpu setup Christoph Lameter
2007-11-28 21:09 ` [patch 02/10] percpu: Move arch XX_PER_CPU_XX definitions into linux/percpu.h Christoph Lameter
2007-11-28 21:09 ` [patch 03/10] percpu: Make the asm-generic/percpu.h more "generic" Christoph Lameter
2007-11-30 11:10 ` Ingo Molnar
2007-11-30 17:09 ` Christoph Lameter
2007-11-30 17:14 ` Ingo Molnar
2007-11-30 17:17 ` Christoph Lameter
2007-11-30 17:58 ` Ingo Molnar
2007-11-30 18:12 ` Ingo Molnar
2007-11-30 18:42 ` Christoph Lameter
2007-11-30 18:49 ` Ingo Molnar
2007-11-30 19:01 ` Christoph Lameter
2007-11-30 19:33 ` Christoph Lameter
2007-11-30 20:13 ` Ingo Molnar
2007-11-28 21:09 ` [patch 04/10] x86_32: Use generic percpu.h Christoph Lameter
2007-11-30 11:11 ` Ingo Molnar
2007-11-28 21:09 ` [patch 05/10] x86_64: Use generic percpu Christoph Lameter
2007-11-30 11:11 ` Ingo Molnar
2007-11-28 21:09 ` [patch 06/10] s390: " Christoph Lameter
2007-11-29 15:56 ` Martin Schwidefsky
2007-11-29 18:16 ` Christoph Lameter
2007-11-28 21:09 ` [patch 07/10] Powerpc: Use generic per cpu Christoph Lameter
2007-11-28 21:09 ` [patch 08/10] Sparc64: Use generic percpu Christoph Lameter
2007-11-28 21:09 ` Christoph Lameter [this message]
2007-11-28 21:09 ` [patch 10/10] x86: Unify percpu.h Christoph Lameter
2007-11-30 11:14 ` Ingo Molnar
2007-12-28 0:16 [PATCH 00/10] percpu: Per cpu code simplification V2 travis
2007-12-28 0:16 ` [PATCH 09/10] ia64: Use generic percpu travis
2008-01-08 2:11 [PATCH 00/10] percpu: Per cpu code simplification V3 travis
2008-01-08 2:11 ` [PATCH 09/10] ia64: Use generic percpu travis
2008-01-08 21:10 [PATCH 00/10] percpu: Per cpu code simplification V4 travis
2008-01-08 21:10 ` [PATCH 09/10] ia64: Use generic percpu travis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071128211528.090929484@sgi.com \
--to=clameter@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).