diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-18 19:48:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-18 19:48:07 -0400 |
commit | 08b5fa819970c318e58ab638f497633c25971813 (patch) | |
tree | a08793025bd43f5efa99ca67f71ea5a50687b41c /lib/bitmap.c | |
parent | 7f02e1ce4a13edf295fcedbc663a8ca69bc1ff6e (diff) | |
parent | 13fe7056bebb4015c6231a07a1be4d3aebbfe979 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
- a new driver for Rohm BU21029 touch controller
- new bitmap APIs: bitmap_alloc, bitmap_zalloc and bitmap_free
- updates to Atmel, eeti. pxrc and iforce drivers
- assorted driver cleanups and fixes.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
MAINTAINERS: Add PhoenixRC Flight Controller Adapter
Input: do not use WARN() in input_alloc_absinfo()
Input: mark expected switch fall-throughs
Input: raydium_i2c_ts - use true and false for boolean values
Input: evdev - switch to bitmap API
Input: gpio-keys - switch to bitmap_zalloc()
Input: elan_i2c_smbus - cast sizeof to int for comparison
bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free()
md: Avoid namespace collision with bitmap API
dm: Avoid namespace collision with bitmap API
Input: pm8941-pwrkey - add resin entry
Input: pm8941-pwrkey - abstract register offsets and event code
Input: iforce - reorganize joystick configuration lists
Input: atmel_mxt_ts - move completion to after config crc is updated
Input: atmel_mxt_ts - don't report zero pressure from T9
Input: atmel_mxt_ts - zero terminate config firmware file
Input: atmel_mxt_ts - refactor config update code to add context struct
Input: atmel_mxt_ts - config CRC may start at T71
Input: atmel_mxt_ts - remove unnecessary debug on ENOMEM
Input: atmel_mxt_ts - remove duplicate setup of ABS_MT_PRESSURE
...
Diffstat (limited to 'lib/bitmap.c')
-rw-r--r-- | lib/bitmap.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/lib/bitmap.c b/lib/bitmap.c index 58f9750e49c6..730969c681cb 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
14 | #include <linux/bug.h> | 14 | #include <linux/bug.h> |
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/slab.h> | ||
16 | #include <linux/string.h> | 17 | #include <linux/string.h> |
17 | #include <linux/uaccess.h> | 18 | #include <linux/uaccess.h> |
18 | 19 | ||
@@ -1125,6 +1126,25 @@ void bitmap_copy_le(unsigned long *dst, const unsigned long *src, unsigned int n | |||
1125 | EXPORT_SYMBOL(bitmap_copy_le); | 1126 | EXPORT_SYMBOL(bitmap_copy_le); |
1126 | #endif | 1127 | #endif |
1127 | 1128 | ||
1129 | unsigned long *bitmap_alloc(unsigned int nbits, gfp_t flags) | ||
1130 | { | ||
1131 | return kmalloc_array(BITS_TO_LONGS(nbits), sizeof(unsigned long), | ||
1132 | flags); | ||
1133 | } | ||
1134 | EXPORT_SYMBOL(bitmap_alloc); | ||
1135 | |||
1136 | unsigned long *bitmap_zalloc(unsigned int nbits, gfp_t flags) | ||
1137 | { | ||
1138 | return bitmap_alloc(nbits, flags | __GFP_ZERO); | ||
1139 | } | ||
1140 | EXPORT_SYMBOL(bitmap_zalloc); | ||
1141 | |||
1142 | void bitmap_free(const unsigned long *bitmap) | ||
1143 | { | ||
1144 | kfree(bitmap); | ||
1145 | } | ||
1146 | EXPORT_SYMBOL(bitmap_free); | ||
1147 | |||
1128 | #if BITS_PER_LONG == 64 | 1148 | #if BITS_PER_LONG == 64 |
1129 | /** | 1149 | /** |
1130 | * bitmap_from_arr32 - copy the contents of u32 array of bits to bitmap | 1150 | * bitmap_from_arr32 - copy the contents of u32 array of bits to bitmap |