Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b9d314c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

include/linux/bitmap.h: cleanup 



Remove two unneeded `else's.

Cc: David Hildenbrand <dahi@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97f2645f

include/linux/bitmap.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -268,10 +268,9 @@ static inline int bitmap_equal(const unsigned long *src1, 
	if (small_const_nbits(nbits))

	if (small_const_nbits(nbits))

		return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits));

		return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits));

#ifdef CONFIG_S390

#ifdef CONFIG_S390

	else if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0)

	if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0)

		return !memcmp(src1, src2, nbits / 8);

		return !memcmp(src1, src2, nbits / 8);

#endif

#endif

	else

	return __bitmap_equal(src1, src2, nbits);

	return __bitmap_equal(src1, src2, nbits);

}

}