lkml.org 
[lkml]   [2008]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 6/6] s390: Use generic percpu linux-2.6.git
    Change s390 percpu.h to use asm-generic/percpu.h

    Based on latest linux-2.6.git

    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>

    Signed-off-by: Mike Travis <travis@sgi.com>
    ---
    linux-2.6.git:
    - added back in missing pieces from x86.git merge
    ---
    include/asm-s390/percpu.h | 33 +++++++++------------------------
    1 file changed, 9 insertions(+), 24 deletions(-)

    --- a/include/asm-s390/percpu.h
    +++ b/include/asm-s390/percpu.h
    @@ -13,40 +13,25 @@
    */
    #if defined(__s390x__) && defined(MODULE)

    -#define __reloc_hide(var,offset) (*({ \
    +#define SHIFT_PERCPU_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_PERCPU_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__ */
    --


    \
     
     \ /
      Last update: 2008-01-30 19:15    [W:0.041 / U:1.440 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site