← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to arch/ia64/kernel/pci-swiotlb.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/ia64/kernel/pci-swiotlb.c
1
1
/* Glue code to lib/swiotlb.c */
2
2
 
3
3
#include <linux/pci.h>
 
4
#include <linux/gfp.h>
4
5
#include <linux/cache.h>
5
6
#include <linux/module.h>
6
7
#include <linux/dma-mapping.h>
30
31
        .unmap_sg = swiotlb_unmap_sg_attrs,
31
32
        .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
32
33
        .sync_single_for_device = swiotlb_sync_single_for_device,
33
 
        .sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,
34
 
        .sync_single_range_for_device = swiotlb_sync_single_range_for_device,
35
34
        .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
36
35
        .sync_sg_for_device = swiotlb_sync_sg_for_device,
37
36
        .dma_supported = swiotlb_dma_supported,
41
40
void __init swiotlb_dma_init(void)
42
41
{
43
42
        dma_ops = &swiotlb_dma_ops;
44
 
        swiotlb_init();
 
43
        swiotlb_init(1);
45
44
}
46
45
 
47
46
void __init pci_swiotlb_init(void)
51
50
                swiotlb = 1;
52
51
                printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
53
52
                machvec_init("dig");
54
 
                swiotlb_init();
 
53
                swiotlb_init(1);
55
54
                dma_ops = &swiotlb_dma_ops;
56
55
#else
57
56
                panic("Unable to find Intel IOMMU");