git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' of git://github.com/tiwai/sound
[pandora-kernel.git]
/
drivers
/
block
/
drbd
/
drbd_nl.c
diff --git
a/drivers/block/drbd/drbd_nl.c
b/drivers/block/drbd/drbd_nl.c
index
515bcd9
..
0feab26
100644
(file)
--- a/
drivers/block/drbd/drbd_nl.c
+++ b/
drivers/block/drbd/drbd_nl.c
@@
-1829,10
+1829,10
@@
static int drbd_nl_syncer_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *n
/* silently ignore cpu mask on UP kernel */
if (nr_cpu_ids > 1 && sc.cpu_mask[0] != 0) {
/* silently ignore cpu mask on UP kernel */
if (nr_cpu_ids > 1 && sc.cpu_mask[0] != 0) {
- err =
__bitmap_parse(sc.cpu_mask, 32, 0
,
+ err =
bitmap_parse(sc.cpu_mask, 32
,
cpumask_bits(new_cpu_mask), nr_cpu_ids);
if (err) {
cpumask_bits(new_cpu_mask), nr_cpu_ids);
if (err) {
- dev_warn(DEV, "
__
bitmap_parse() failed with %d\n", err);
+ dev_warn(DEV, "bitmap_parse() failed with %d\n", err);
retcode = ERR_CPU_MASK_PARSE;
goto fail;
}
retcode = ERR_CPU_MASK_PARSE;
goto fail;
}