Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Wed, 7 Jan 2009 01:10:04 +0000 (17:10 -0800)]
* '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  2 
include/linux/percpu_counter.h
lib/percpu_counter.c
lib/proportions.c
lib/swiotlb.c
mm/backing-dev.c

@@@ -24,10 -24,22 +24,18 @@@ struct percpu_counter 
        s32 *counters;
  };
  
 -#if NR_CPUS >= 16
 -#define FBC_BATCH     (NR_CPUS*2)
 -#else
 -#define FBC_BATCH     (NR_CPUS*4)
 -#endif
 +extern int percpu_counter_batch;
  
- int percpu_counter_init(struct percpu_counter *fbc, s64 amount);
- int percpu_counter_init_irq(struct percpu_counter *fbc, s64 amount);
+ int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
+                         struct lock_class_key *key);
+ #define percpu_counter_init(fbc, value)                                       \
+       ({                                                              \
+               static struct lock_class_key __key;                     \
+                                                                       \
+               __percpu_counter_init(fbc, value, &__key);              \
+       })
  void percpu_counter_destroy(struct percpu_counter *fbc);
  void percpu_counter_set(struct percpu_counter *fbc, s64 amount);
  void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch);
Simple merge
Simple merge
diff --cc lib/swiotlb.c
Simple merge
Simple merge