diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 803a374f6766..52b3a06a02f8 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/swap.h> | 23 | #include <linux/swap.h> |
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | #include <linux/sysctl.h> | 25 | #include <linux/sysctl.h> |
26 | #include <linux/bitmap.h> | ||
26 | #include <linux/signal.h> | 27 | #include <linux/signal.h> |
27 | #include <linux/printk.h> | 28 | #include <linux/printk.h> |
28 | #include <linux/proc_fs.h> | 29 | #include <linux/proc_fs.h> |
@@ -2395,9 +2396,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write, | |||
2395 | } | 2396 | } |
2396 | } | 2397 | } |
2397 | 2398 | ||
2398 | while (val_a <= val_b) | 2399 | bitmap_set(tmp_bitmap, val_a, val_b - val_a + 1); |
2399 | set_bit(val_a++, tmp_bitmap); | ||
2400 | |||
2401 | first = 0; | 2400 | first = 0; |
2402 | proc_skip_char(&kbuf, &left, '\n'); | 2401 | proc_skip_char(&kbuf, &left, '\n'); |
2403 | } | 2402 | } |
@@ -2440,8 +2439,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write, | |||
2440 | if (*ppos) | 2439 | if (*ppos) |
2441 | bitmap_or(bitmap, bitmap, tmp_bitmap, bitmap_len); | 2440 | bitmap_or(bitmap, bitmap, tmp_bitmap, bitmap_len); |
2442 | else | 2441 | else |
2443 | memcpy(bitmap, tmp_bitmap, | 2442 | bitmap_copy(bitmap, tmp_bitmap, bitmap_len); |
2444 | BITS_TO_LONGS(bitmap_len) * sizeof(unsigned long)); | ||
2445 | } | 2443 | } |
2446 | kfree(tmp_bitmap); | 2444 | kfree(tmp_bitmap); |
2447 | *lenp -= left; | 2445 | *lenp -= left; |