diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-06 02:28:36 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-06 02:28:36 +0400 |
| commit | 789ce9b9c24058dfd7a3e7396e0e34fb61068d43 (patch) | |
| tree | b440fc89c7490dd346fa49ccb5aea8cdc179b530 /mm | |
| parent | 3a81a6e7802947b4e8b259353767f7b0d2701b1d (diff) | |
| parent | adb795062f89b8d67d295ee25e04034bccce6779 (diff) | |
| download | linux-789ce9b9c24058dfd7a3e7396e0e34fb61068d43.tar.xz | |
Merge branch 'for-3.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
Pull per-cpu patches from Tejun Heo:
"This pull request contains four patches. One replaces manual clearing
with bitmap_clear(), two fix generic definition of __this_cpu ops so
that they don't choose unnecessarily strict arch version. One makes
_this_cpu definition use raw_local_irq_*() so that it doesn't end up
wrecking irq on/off state tracking when used from inside lockdep.
Of the four patches, the raw_local_irq_*() update is the most
important, so please feel free to cherry pick only that one patch and
ignore the rest if you want to - commit e920d5971d 'percpu: use
raw_local_irq_* in _this_cpu op'."
* 'for-3.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: fix __this_cpu_{sub,inc,dec}_return() definition
percpu: use raw_local_irq_* in _this_cpu op
percpu: fix generic definition of __this_cpu_add_and_return()
percpu: use bitmap_clear
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/percpu-vm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/percpu-vm.c b/mm/percpu-vm.c index 12a48a88c0d8..405d331804c3 100644 --- a/mm/percpu-vm.c +++ b/mm/percpu-vm.c @@ -184,8 +184,7 @@ static void pcpu_unmap_pages(struct pcpu_chunk *chunk, page_end - page_start); } - for (i = page_start; i < page_end; i++) - __clear_bit(i, populated); + bitmap_clear(populated, page_start, page_end - page_start); } /** |