diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-11 00:07:47 +0200 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-11 00:07:47 +0200 |
| commit | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (patch) | |
| tree | 0cea46e43f0625244c3d06a71d6559e5ec5419ca /arch/x86/kernel/pci-nommu.c | |
| parent | xfs: prevent deadlock in xfs_qm_shake() (diff) | |
| parent | Linux 2.6.30 (diff) | |
| download | linux-4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7.tar.xz linux-4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/kernel/pci-nommu.c')
| -rw-r--r-- | arch/x86/kernel/pci-nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c index c6d703b39326..71d412a09f30 100644 --- a/arch/x86/kernel/pci-nommu.c +++ b/arch/x86/kernel/pci-nommu.c @@ -15,7 +15,7 @@ static int check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size) { if (hwdev && !is_buffer_dma_capable(*hwdev->dma_mask, bus, size)) { - if (*hwdev->dma_mask >= DMA_32BIT_MASK) + if (*hwdev->dma_mask >= DMA_BIT_MASK(32)) printk(KERN_ERR "nommu_%s: overflow %Lx+%zu of device mask %Lx\n", name, (long long)bus, size, |