Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rcu: fix rcutorture bug
  rcu: eliminate synchronize_rcu_xxx macro
  rcu: make treercu safe for suspend and resume
  rcu: fix rcutree grace-period-latency bug on small systems
  futex: catch certain assymetric (get|put)_futex_key calls
  futex: make futex_(get|put)_key() calls symmetric
  locking, percpu counters: introduce separate lock classes
  swiotlb: clean up EXPORT_SYMBOL usage
  swiotlb: remove unnecessary declaration
  swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h
  swiotlb: add support for systems with highmem
  swiotlb: store phys address in io_tlb_orig_addr array
  swiotlb: add hwdev to swiotlb_phys_to_bus() / swiotlb_sg_to_bus()

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/proportions.c b/lib/proportions.c
index 3fda810faf0d..d50746a79de2 100644
--- a/lib/proportions.c
+++ b/lib/proportions.c
@@ -83,11 +83,11 @@ int prop_descriptor_init(struct prop_descriptor *pd, int shift)
         pd->index = 0;
         pd->pg[0].shift = shift;
         mutex_init(&pd->mutex);
-        err = percpu_counter_init_irq(&pd->pg[0].events, 0);
+        err = percpu_counter_init(&pd->pg[0].events, 0);
         if (err)
                 goto out;
 
-        err = percpu_counter_init_irq(&pd->pg[1].events, 0);
+        err = percpu_counter_init(&pd->pg[1].events, 0);
         if (err)
                 percpu_counter_destroy(&pd->pg[0].events);
 
@@ -193,7 +193,7 @@ int prop_local_init_percpu(struct prop_local_percpu *pl)
         spin_lock_init(&pl->lock);
         pl->shift = 0;
         pl->period = 0;
-        return percpu_counter_init_irq(&pl->events, 0);
+        return percpu_counter_init(&pl->events, 0);
 }
 
 void prop_local_destroy_percpu(struct prop_local_percpu *pl)