diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 17:53:34 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 17:53:34 +1000 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /include/asm-s390 | |
| parent | 6218a761bbc27acc65248c80024875bcc06d52b1 (diff) | |
| parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 (diff) | |
| download | blackbird-op-linux-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.tar.gz blackbird-op-linux-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.zip | |
Merge branch 'merge'
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/futex.h | 15 | ||||
| -rw-r--r-- | include/asm-s390/lowcore.h | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/asm-s390/futex.h b/include/asm-s390/futex.h index 40c25e166a9b..1802775568b9 100644 --- a/include/asm-s390/futex.h +++ b/include/asm-s390/futex.h @@ -11,23 +11,24 @@ #define __futex_atomic_fixup \ ".section __ex_table,\"a\"\n" \ " .align 4\n" \ - " .long 0b,2b,1b,2b\n" \ + " .long 0b,4b,2b,4b,3b,4b\n" \ ".previous" #else /* __s390x__ */ #define __futex_atomic_fixup \ ".section __ex_table,\"a\"\n" \ " .align 8\n" \ - " .quad 0b,2b,1b,2b\n" \ + " .quad 0b,4b,2b,4b,3b,4b\n" \ ".previous" #endif /* __s390x__ */ #define __futex_atomic_op(insn, ret, oldval, newval, uaddr, oparg) \ - asm volatile(" l %1,0(%6)\n" \ - "0: " insn \ - " cs %1,%2,0(%6)\n" \ - "1: jl 0b\n" \ + asm volatile(" sacf 256\n" \ + "0: l %1,0(%6)\n" \ + "1: " insn \ + "2: cs %1,%2,0(%6)\n" \ + "3: jl 1b\n" \ " lhi %0,0\n" \ - "2:\n" \ + "4: sacf 0\n" \ __futex_atomic_fixup \ : "=d" (ret), "=&d" (oldval), "=&d" (newval), \ "=m" (*uaddr) \ diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h index db0606c1abd4..bea727904287 100644 --- a/include/asm-s390/lowcore.h +++ b/include/asm-s390/lowcore.h @@ -98,8 +98,8 @@ #define __LC_KERNEL_ASCE 0xD58 #define __LC_USER_ASCE 0xD60 #define __LC_PANIC_STACK 0xD68 -#define __LC_CPUID 0xD90 -#define __LC_CPUADDR 0xD98 +#define __LC_CPUID 0xD80 +#define __LC_CPUADDR 0xD88 #define __LC_IPLDEV 0xDB8 #define __LC_JIFFY_TIMER 0xDC0 #define __LC_CURRENT 0xDD8 |
