The patch titled Subject: lib: bitmap: change bitmap_shift_left to take unsigned parameters has been added to the -mm tree. Its filename is lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Subject: lib: bitmap: change bitmap_shift_left to take unsigned parameters gcc can generate slightly better code for stuff like "nbits % BITS_PER_LONG" when it knows nbits is not negative. Since negative size bitmaps or shift amounts don't make sense, change these parameters of bitmap_shift_right to unsigned. If off >= lim (which requires shift >= nbits), k is initialized with a large positive value, but since I've let k continue to be signed, the loop will never run and dst will be zeroed as expected. Inside the loop, k is guaranteed to be non-negative, so the fact that it is promoted to unsigned in the various expressions it appears in is harmless. Also use "shift" and "nbits" consistently for the parameter names. Signed-off-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/bitmap.h | 12 ++++++------ lib/bitmap.c | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff -puN include/linux/bitmap.h~lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters include/linux/bitmap.h --- a/include/linux/bitmap.h~lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters +++ a/include/linux/bitmap.h @@ -98,8 +98,8 @@ extern void __bitmap_complement(unsigned unsigned int nbits); extern void __bitmap_shift_right(unsigned long *dst, const unsigned long *src, unsigned int shift, unsigned int nbits); -extern void __bitmap_shift_left(unsigned long *dst, - const unsigned long *src, int shift, int bits); +extern void __bitmap_shift_left(unsigned long *dst, const unsigned long *src, + unsigned int shift, unsigned int nbits); extern int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, const unsigned long *bitmap2, unsigned int nbits); extern void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, @@ -322,13 +322,13 @@ static inline void bitmap_shift_right(un __bitmap_shift_right(dst, src, shift, nbits); } -static inline void bitmap_shift_left(unsigned long *dst, - const unsigned long *src, int n, int nbits) +static inline void bitmap_shift_left(unsigned long *dst, const unsigned long *src, + unsigned int shift, unsigned int nbits) { if (small_const_nbits(nbits)) - *dst = (*src << n) & BITMAP_LAST_WORD_MASK(nbits); + *dst = (*src << shift) & BITMAP_LAST_WORD_MASK(nbits); else - __bitmap_shift_left(dst, src, n, nbits); + __bitmap_shift_left(dst, src, shift, nbits); } static inline int bitmap_parse(const char *buf, unsigned int buflen, diff -puN lib/bitmap.c~lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters lib/bitmap.c --- a/lib/bitmap.c~lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters +++ a/lib/bitmap.c @@ -148,18 +148,19 @@ EXPORT_SYMBOL(__bitmap_shift_right); * @dst : destination bitmap * @src : source bitmap * @shift : shift by this many bits - * @bits : bitmap size, in bits + * @nbits : bitmap size, in bits * * Shifting left (multiplying) means moving bits in the LS -> MS * direction. Zeros are fed into the vacated LS bit positions * and those MS bits shifted off the top are lost. */ -void __bitmap_shift_left(unsigned long *dst, - const unsigned long *src, int shift, int bits) +void __bitmap_shift_left(unsigned long *dst, const unsigned long *src, + unsigned int shift, unsigned int nbits) { - int k, lim = BITS_TO_LONGS(bits), left = bits % BITS_PER_LONG; - int off = shift/BITS_PER_LONG, rem = shift % BITS_PER_LONG; + int k; + unsigned int lim = BITS_TO_LONGS(nbits), left = nbits % BITS_PER_LONG; + unsigned int off = shift/BITS_PER_LONG, rem = shift % BITS_PER_LONG; for (k = lim - off - 1; k >= 0; --k) { unsigned long upper, lower; _ Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxx are lib-string_get_size-remove-redundant-prefixes.patch lib-string_get_size-use-32-bit-arithmetic-when-possible.patch lib-string_get_size-return-void.patch lib-bitmap-more-signed-unsigned-conversions.patch linux-nodemaskh-update-bitmap-wrappers-to-take-unsigned-int.patch linux-cpumaskh-update-bitmap-wrappers-to-take-unsigned-int.patch lib-bitmap-update-bitmap_onto-to-unsigned.patch lib-bitmap-update-bitmap_onto-to-unsigned-checkpatch-fixes.patch lib-bitmap-change-parameters-of-bitmap_fold-to-unsigned.patch lib-bitmap-simplify-bitmap_pos_to_ord.patch lib-bitmap-simplify-bitmap_ord_to_pos.patch lib-bitmap-make-the-bits-parameter-of-bitmap_remap-unsigned.patch lib-remove-strnicmp.patch lib-interval_treec-simplify-includes.patch lib-sortc-use-simpler-includes.patch lib-dynamic_queue_limitsc-simplify-includes.patch lib-halfmd4c-simplify-includes.patch lib-idrc-remove-redundant-include.patch lib-genallocc-remove-redundant-include.patch lib-list_sortc-rearrange-includes.patch lib-md5c-simplify-include.patch lib-llistc-remove-redundant-include.patch lib-kobject_ueventc-remove-redundant-include.patch lib-nlattrc-remove-redundant-include.patch lib-plistc-remove-redundant-include.patch lib-radix-treec-change-to-simpler-include.patch lib-show_memc-remove-redundant-include.patch lib-sortc-move-include-inside-if-0.patch lib-stmp_devicec-replace-moduleh-include.patch lib-strncpy_from_userc-replace-moduleh-include.patch lib-percpu_idac-remove-redundant-includes.patch lib-lcmc-replace-include.patch lib-bitmapc-change-prototype-of-bitmap_copy_le.patch lib-bitmapc-elide-bitmap_copy_le-on-little-endian.patch lib-bitmap-change-bitmap_shift_right-to-take-unsigned-parameters.patch lib-bitmap-eliminate-branch-in-__bitmap_shift_right.patch lib-bitmap-remove-redundant-code-from-__bitmap_shift_right.patch lib-bitmap-yet-another-simplification-in-__bitmap_shift_right.patch lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters.patch lib-bitmap-eliminate-branch-in-__bitmap_shift_left.patch lib-bitmap-remove-redundant-code-from-__bitmap_shift_left.patch checkpatch-emit-an-error-when-using-predefined-timestamp-macros.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html