Commit f0343474 authored by travis@sgi.com's avatar travis@sgi.com Committed by Ingo Molnar

s390: use generic percpu linux-2.6.git

Change s390 percpu.h to use asm-generic/percpu.h
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 56f90205
...@@ -13,40 +13,25 @@ ...@@ -13,40 +13,25 @@
*/ */
#if defined(__s390x__) && defined(MODULE) #if defined(__s390x__) && defined(MODULE)
#define __reloc_hide(var,offset) (*({ \ #define SHIFT_PERCPU_PTR(ptr,offset) (({ \
extern int simple_identifier_##var(void); \ extern int simple_identifier_##var(void); \
unsigned long *__ptr; \ unsigned long *__ptr; \
asm ( "larl %0,per_cpu__"#var"@GOTENT" \ asm ( "larl %0, %1@GOTENT" \
: "=a" (__ptr) : "X" (per_cpu__##var) ); \ : "=a" (__ptr) : "X" (ptr) ); \
(typeof(&per_cpu__##var))((*__ptr) + (offset)); })) (typeof(ptr))((*__ptr) + (offset)); }))
#else #else
#define __reloc_hide(var, offset) (*({ \ #define SHIFT_PERCPU_PTR(ptr, offset) (({ \
extern int simple_identifier_##var(void); \ extern int simple_identifier_##var(void); \
unsigned long __ptr; \ unsigned long __ptr; \
asm ( "" : "=a" (__ptr) : "0" (&per_cpu__##var) ); \ asm ( "" : "=a" (__ptr) : "0" (ptr) ); \
(typeof(&per_cpu__##var)) (__ptr + (offset)); })) (typeof(ptr)) (__ptr + (offset)); }))
#endif #endif
#ifdef CONFIG_SMP #define __my_cpu_offset S390_lowcore.percpu_offset
extern unsigned long __per_cpu_offset[NR_CPUS]; #include <asm-generic/percpu.h>
#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
#endif /* __ARCH_S390_PERCPU__ */ #endif /* __ARCH_S390_PERCPU__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment