← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to arch/x86/kernel/pci-dma.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/kernel/pci-dma.c
100
100
                                 struct dma_attrs *attrs)
101
101
{
102
102
        unsigned long dma_mask;
103
 
        struct page *page = NULL;
 
103
        struct page *page;
104
104
        unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
105
105
        dma_addr_t addr;
106
106
 
108
108
 
109
109
        flag |= __GFP_ZERO;
110
110
again:
 
111
        page = NULL;
111
112
        if (!(flag & GFP_ATOMIC))
112
113
                page = dma_alloc_from_contiguous(dev, count, get_order(size));
113
114
        if (!page)