Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 02:43:43 +0000 (16:43 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2011 02:43:43 +0000 (16:43 -1000)
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  dmaengine: use DEFINE_IDR for static initialization
  ioat: fix xor_idx_to_desc
  Avoid section type conflict in dma/ioat/dma_v3.c
  ioat: Adding PCI IDs for IOAT devices on SandyBridge platforms

1  2 
drivers/dma/dmaengine.c
include/linux/pci_ids.h

diff --combined drivers/dma/dmaengine.c
index 26374b2a55a24dcc49a2400377239a5edc51a07e,bc11eebff44d7fc6d17b82e680c972dff42427da..b48967b499da0bad30529501492def4695dc1f25
@@@ -45,7 -45,6 +45,7 @@@
   * See Documentation/dmaengine.txt for more details
   */
  
 +#include <linux/dma-mapping.h>
  #include <linux/init.h>
  #include <linux/module.h>
  #include <linux/mm.h>
@@@ -62,9 -61,9 +62,9 @@@
  #include <linux/slab.h>
  
  static DEFINE_MUTEX(dma_list_mutex);
+ static DEFINE_IDR(dma_idr);
  static LIST_HEAD(dma_device_list);
  static long dmaengine_ref_count;
- static struct idr dma_idr;
  
  /* --- sysfs implementation --- */
  
@@@ -510,8 -509,8 +510,8 @@@ struct dma_chan *__dma_request_channel(
                                         dma_chan_name(chan));
                                list_del_rcu(&device->global_node);
                        } else if (err)
 -                              pr_err("dmaengine: failed to get %s: (%d)\n",
 -                                     dma_chan_name(chan), err);
 +                              pr_debug("dmaengine: failed to get %s: (%d)\n",
 +                                       dma_chan_name(chan), err);
                        else
                                break;
                        if (--device->privatecnt == 0)
@@@ -1050,8 -1049,6 +1050,6 @@@ EXPORT_SYMBOL_GPL(dma_run_dependencies)
  
  static int __init dma_bus_init(void)
  {
-       idr_init(&dma_idr);
-       mutex_init(&dma_list_mutex);
        return class_register(&dma_devclass);
  }
  arch_initcall(dma_bus_init);
diff --combined include/linux/pci_ids.h
index b00c4ec5056e2f870830d2a68380e86385df679a,a8571b36ae97ed9f079df2d7506226c7dff7474f..ae96bbe54518449fc66357b5405d0a175e61ca28
  #define PCI_SUBDEVICE_ID_CREATIVE_SB08801     0x0041
  #define PCI_SUBDEVICE_ID_CREATIVE_SB08802     0x0042
  #define PCI_SUBDEVICE_ID_CREATIVE_SB08803     0x0043
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB1270      0x0062
  #define PCI_SUBDEVICE_ID_CREATIVE_HENDRIX     0x6000
  
  #define PCI_VENDOR_ID_ECTIVA          0x1102 /* duplicate: CREATIVE */
  #define PCI_DEVICE_ID_TIGON3_5761E    0x1680
  #define PCI_DEVICE_ID_TIGON3_5761     0x1681
  #define PCI_DEVICE_ID_TIGON3_5764     0x1684
 +#define PCI_DEVICE_ID_NX2_57800               0x168a
 +#define PCI_DEVICE_ID_NX2_57840               0x168d
 +#define PCI_DEVICE_ID_NX2_57810               0x168e
  #define PCI_DEVICE_ID_TIGON3_5787M    0x1693
  #define PCI_DEVICE_ID_TIGON3_5782     0x1696
  #define PCI_DEVICE_ID_TIGON3_5784     0x1698
  #define PCI_DEVICE_ID_TIGON3_5787     0x169b
  #define PCI_DEVICE_ID_TIGON3_5788     0x169c
  #define PCI_DEVICE_ID_TIGON3_5789     0x169d
 +#define PCI_DEVICE_ID_NX2_57800_MF    0x16a5
  #define PCI_DEVICE_ID_TIGON3_5702X    0x16a6
  #define PCI_DEVICE_ID_TIGON3_5703X    0x16a7
  #define PCI_DEVICE_ID_TIGON3_5704S    0x16a8
 +#define PCI_DEVICE_ID_NX2_57800_VF    0x16a9
  #define PCI_DEVICE_ID_NX2_5706S               0x16aa
 +#define PCI_DEVICE_ID_NX2_57840_MF    0x16ab
  #define PCI_DEVICE_ID_NX2_5708S               0x16ac
 +#define PCI_DEVICE_ID_NX2_57840_VF    0x16ad
 +#define PCI_DEVICE_ID_NX2_57810_MF    0x16ae
 +#define PCI_DEVICE_ID_NX2_57810_VF    0x16af
  #define PCI_DEVICE_ID_TIGON3_5702A3   0x16c6
  #define PCI_DEVICE_ID_TIGON3_5703A3   0x16c7
  #define PCI_DEVICE_ID_TIGON3_5781     0x16dd
  #define PCI_DEVICE_ID_INTEL_ICH10_5   0x3a60
  #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN     0x3b00
  #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX     0x3b1f
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB0 0x3c20
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB1 0x3c21
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB2 0x3c22
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB3 0x3c23
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB4 0x3c24
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB5 0x3c25
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB6 0x3c26
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB7 0x3c27
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB8 0x3c2e
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB9 0x3c2f
  #define PCI_DEVICE_ID_INTEL_IOAT_SNB  0x402f
  #define PCI_DEVICE_ID_INTEL_5100_16   0x65f0
  #define PCI_DEVICE_ID_INTEL_5100_21   0x65f5
  #define PCI_DEVICE_ID_NETMOS_9845     0x9845
  #define PCI_DEVICE_ID_NETMOS_9855     0x9855
  #define PCI_DEVICE_ID_NETMOS_9865     0x9865
 +#define PCI_DEVICE_ID_NETMOS_9900     0x9900
  #define PCI_DEVICE_ID_NETMOS_9901     0x9901
 +#define PCI_DEVICE_ID_NETMOS_9904     0x9904
 +#define PCI_DEVICE_ID_NETMOS_9912     0x9912
 +#define PCI_DEVICE_ID_NETMOS_9922     0x9922
  
  #define PCI_VENDOR_ID_3COM_2          0xa727