]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'target-updates/for-next'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:48:20 +0000 (11:48 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:48:20 +0000 (11:48 +0200)
1  2 
drivers/target/iscsi/iscsi_target.c
drivers/target/iscsi/iscsi_target_nego.c
drivers/usb/gadget/tcm_usb_gadget.c
drivers/vhost/scsi.c
lib/percpu_ida.c

Simple merge
Simple merge
Simple merge
index b0698ea972c65025976e87d6e1a5bb5beac92747,e315903ec63a80fd95581806a1ee01c2c331d58e..9d054bf91d0f3cd278494dedd3114dfd3b292bcb
@@@ -114,11 -123,10 +114,10 @@@ static inline void alloc_global_tags(st
  {
        move_tags(tags->freelist, &tags->nr_free,
                  pool->freelist, &pool->nr_free,
 -                min(pool->nr_free, IDA_PCPU_BATCH_MOVE));
 +                min(pool->nr_free, pool->percpu_batch_size));
  }
  
- static inline unsigned alloc_local_tag(struct percpu_ida *pool,
-                                      struct percpu_ida_cpu *tags)
+ static inline unsigned alloc_local_tag(struct percpu_ida_cpu *tags)
  {
        int tag = -ENOSPC;