From 15afcb2f0d2c391cc1e63e646389ffe4d60cf90b Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Tue, 19 Feb 2008 15:29:28 +0100 Subject: [PATCH] --- yaml --- r: 85900 b: refs/heads/master c: a22fb7ff1259e6ee87d0ba3559c9f7b7d0cb20d2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-s390/bitops.h | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a2e5aa838c51..13f9021557e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03513bccad33667ed738cfd96dc5757e539e0bdb +refs/heads/master: a22fb7ff1259e6ee87d0ba3559c9f7b7d0cb20d2 diff --git a/trunk/include/asm-s390/bitops.h b/trunk/include/asm-s390/bitops.h index ab83c844d04c..965394e69452 100644 --- a/trunk/include/asm-s390/bitops.h +++ b/trunk/include/asm-s390/bitops.h @@ -456,16 +456,18 @@ static inline unsigned long __ffz_word_loop(const unsigned long *addr, asm volatile( #ifndef __s390x__ - " ahi %1,31\n" - " srl %1,5\n" + " ahi %1,-1\n" + " sra %1,5\n" + " jz 1f\n" "0: c %2,0(%0,%3)\n" " jne 1f\n" " la %0,4(%0)\n" " brct %1,0b\n" "1:\n" #else - " aghi %1,63\n" - " srlg %1,%1,6\n" + " aghi %1,-1\n" + " srag %1,%1,6\n" + " jz 1f\n" "0: cg %2,0(%0,%3)\n" " jne 1f\n" " la %0,8(%0)\n" @@ -491,16 +493,18 @@ static inline unsigned long __ffs_word_loop(const unsigned long *addr, asm volatile( #ifndef __s390x__ - " ahi %1,31\n" - " srl %1,5\n" + " ahi %1,-1\n" + " sra %1,5\n" + " jz 1f\n" "0: c %2,0(%0,%3)\n" " jne 1f\n" " la %0,4(%0)\n" " brct %1,0b\n" "1:\n" #else - " aghi %1,63\n" - " srlg %1,%1,6\n" + " aghi %1,-1\n" + " srag %1,%1,6\n" + " jz 1f\n" "0: cg %2,0(%0,%3)\n" " jne 1f\n" " la %0,8(%0)\n"