projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'linux-watchdog-5.6-rc1' of git://www.linux-watchdog.org/linux-watchdog
[linux-2.6-microblaze.git]
/
include
/
linux
/
bitmap.h
diff --git
a/include/linux/bitmap.h
b/include/linux/bitmap.h
index
80ad521
..
e52ceb1
100644
(file)
--- a/
include/linux/bitmap.h
+++ b/
include/linux/bitmap.h
@@
-186,7
+186,7
@@
bitmap_find_next_zero_area(unsigned long *map,
align_mask, 0);
}
align_mask, 0);
}
-extern int
__bitmap_parse(const char *buf, unsigned int buflen, int is_user
,
+extern int
bitmap_parse(const char *buf, unsigned int buflen
,
unsigned long *dst, int nbits);
extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen,
unsigned long *dst, int nbits);
unsigned long *dst, int nbits);
extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen,
unsigned long *dst, int nbits);
@@
-454,12
+454,6
@@
static inline void bitmap_replace(unsigned long *dst,
__bitmap_replace(dst, old, new, mask, nbits);
}
__bitmap_replace(dst, old, new, mask, nbits);
}
-static inline int bitmap_parse(const char *buf, unsigned int buflen,
- unsigned long *maskp, int nmaskbits)
-{
- return __bitmap_parse(buf, buflen, 0, maskp, nmaskbits);
-}
-
static inline void bitmap_next_clear_region(unsigned long *bitmap,
unsigned int *rs, unsigned int *re,
unsigned int end)
static inline void bitmap_next_clear_region(unsigned long *bitmap,
unsigned int *rs, unsigned int *re,
unsigned int end)