From: Christoph Lameter <clameter@sgi.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, schwidefsky@de.ibm.com
Subject: [patch 10/14] s390: Use generic percpu
Date: Mon, 26 Nov 2007 16:14:17 -0800 [thread overview]
Message-ID: <20071127001431.461987808@sgi.com> (raw)
In-Reply-To: 20071127001407.859743255@sgi.com
[-- Attachment #1: s390_generic_percpu --]
[-- Type: text/plain, Size: 2317 bytes --]
s390 has a special way to determine the pointer to a per cpu area
plus there is a way to access the base of the per cpu area of the
currently executing processor.
Note: I had to do a minor change to ASM code. Please check that
this was done right.
Cc: schwidefsky@de.ibm.com
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
include/asm-s390/percpu.h | 33 +++++++++------------------------
1 file changed, 9 insertions(+), 24 deletions(-)
Index: linux-2.6/include/asm-s390/percpu.h
===================================================================
--- linux-2.6.orig/include/asm-s390/percpu.h 2007-11-24 16:20:38.776100537 -0800
+++ linux-2.6/include/asm-s390/percpu.h 2007-11-24 16:21:11.536101444 -0800
@@ -13,40 +13,25 @@
*/
#if defined(__s390x__) && defined(MODULE)
-#define __reloc_hide(var,offset) (*({ \
+#define SHIFT_PTR(ptr,offset) (({ \
extern int simple_identifier_##var(void); \
unsigned long *__ptr; \
- asm ( "larl %0,per_cpu__"#var"@GOTENT" \
- : "=a" (__ptr) : "X" (per_cpu__##var) ); \
- (typeof(&per_cpu__##var))((*__ptr) + (offset)); }))
+ asm ( "larl %0, %1@GOTENT" \
+ : "=a" (__ptr) : "X" (ptr) ); \
+ (typeof(ptr))((*__ptr) + (offset)); }))
#else
-#define __reloc_hide(var, offset) (*({ \
+#define SHIFT_PTR(ptr, offset) (({ \
extern int simple_identifier_##var(void); \
unsigned long __ptr; \
- asm ( "" : "=a" (__ptr) : "0" (&per_cpu__##var) ); \
- (typeof(&per_cpu__##var)) (__ptr + (offset)); }))
+ asm ( "" : "=a" (__ptr) : "0" (ptr) ); \
+ (typeof(ptr)) (__ptr + (offset)); }))
#endif
-#ifdef CONFIG_SMP
+#define __my_cpu_offset S390_lowcore.percpu_offset
-extern unsigned long __per_cpu_offset[NR_CPUS];
-
-#define __get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset)
-#define __raw_get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset)
-#define per_cpu(var,cpu) __reloc_hide(var,__per_cpu_offset[cpu])
-#define per_cpu_offset(x) (__per_cpu_offset[x])
-
-#else /* ! SMP */
-
-#define __get_cpu_var(var) __reloc_hide(var,0)
-#define __raw_get_cpu_var(var) __reloc_hide(var,0)
-#define per_cpu(var,cpu) __reloc_hide(var,0)
-
-#endif /* SMP */
-
-#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name
+#include <asm-generic/percpu.h>
#endif /* __ARCH_S390_PERCPU__ */
--
next prev parent reply other threads:[~2007-11-27 0:17 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-27 0:14 [patch 00/14] Per cpu code simplification Christoph Lameter
2007-11-27 0:14 ` [patch 01/14] Modules: Handle symbols that have a zero value Christoph Lameter
2007-11-27 0:14 ` [patch 02/14] Modules: Include sections.h to avoid defining linker variables explicitly Christoph Lameter
2007-11-27 0:14 ` [patch 03/14] Modules: Fold percpu_modcopy into module.c and get rid of the macro from hell Christoph Lameter
2007-11-27 0:14 ` [patch 04/14] ia64: Remove the __SMALL_ADDR_AREA attribute for per cpu access Christoph Lameter
2007-11-27 5:20 ` David Mosberger-Tang
2007-11-27 18:15 ` Christoph Lameter
2007-11-27 21:10 ` David Mosberger-Tang
2007-11-27 21:18 ` Christoph Lameter
2007-11-27 21:27 ` David Mosberger-Tang
2007-11-27 22:02 ` Christoph Lameter
2007-11-27 9:30 ` Andreas Schwab
2007-11-27 18:17 ` Christoph Lameter
2007-11-27 21:24 ` Andreas Schwab
2007-11-27 21:38 ` Christoph Lameter
2007-11-27 22:14 ` Adrian Bunk
2007-11-27 0:14 ` [patch 05/14] percpu: Use a Kconfig variable to configure arch specific percpu setup Christoph Lameter
2007-11-27 4:30 ` Rusty Russell
2007-11-27 18:14 ` Christoph Lameter
2007-11-28 1:36 ` Rusty Russell
2007-11-28 18:51 ` Christoph Lameter
2007-11-28 23:17 ` Rusty Russell
2007-11-28 23:36 ` Christoph Lameter
2007-11-30 2:23 ` Rusty Russell
2007-11-28 23:45 ` Jeremy Fitzhardinge
2007-11-29 0:11 ` Christoph Lameter
2007-11-29 1:18 ` Andi Kleen
2007-11-29 1:27 ` Christoph Lameter
2007-11-29 1:30 ` Jeremy Fitzhardinge
2007-11-29 1:32 ` Andi Kleen
2007-11-29 1:35 ` Christoph Lameter
2007-11-29 1:42 ` Jeremy Fitzhardinge
2007-11-29 1:48 ` Christoph Lameter
2007-11-29 1:54 ` Jeremy Fitzhardinge
2007-11-29 2:06 ` Christoph Lameter
2007-11-29 5:29 ` Jeremy Fitzhardinge
2007-11-29 6:08 ` Christoph Lameter
2007-11-29 6:10 ` Christoph Lameter
2007-11-27 23:40 ` Randy Dunlap
2007-11-28 0:03 ` Christoph Lameter
2007-11-28 0:05 ` Randy Dunlap
2007-11-27 0:14 ` [patch 06/14] percpu: Move arch XX_PER_CPU_XX definitions into linux/percpu.h Christoph Lameter
2007-11-27 0:14 ` [patch 07/14] percpu: Make the asm-generic/percpu.h more generic Christoph Lameter
2007-11-27 0:14 ` [patch 08/14] x86_32: Use generic percpu.h Christoph Lameter
2007-11-27 0:14 ` [patch 09/14] x86_64: Use generic percpu Christoph Lameter
2007-11-27 0:14 ` Christoph Lameter [this message]
2007-11-27 0:14 ` [patch 11/14] Powerpc: Use generic per cpu Christoph Lameter
2007-11-27 7:41 ` Kumar Gala
2007-11-27 18:16 ` Christoph Lameter
2007-11-27 20:58 ` Paul Mackerras
2007-11-27 21:13 ` Christoph Lameter
2007-11-28 2:35 ` Paul Mackerras
2007-11-28 18:54 ` Christoph Lameter
2007-12-02 20:55 ` Benjamin Herrenschmidt
2007-11-27 0:14 ` [patch 12/14] Sparc64: Use generic percpu Christoph Lameter
2007-11-27 0:14 ` [patch 13/14] ia64: " Christoph Lameter
2007-11-27 1:37 ` Christoph Lameter
2007-11-27 0:14 ` [patch 14/14] x86: Unify percpu.h Christoph Lameter
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=20071127001431.461987808@sgi.com \
--to=clameter@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=schwidefsky@de.ibm.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).