diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /arch/x86_64/kernel/pci-nommu.c | |
| parent | 382066da251132f768380f4852ed5afb72d88f80 (diff) | |
| parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/x86_64/kernel/pci-nommu.c')
| -rw-r--r-- | arch/x86_64/kernel/pci-nommu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c index 44adcc2d5e5..1f6ecc62061 100644 --- a/arch/x86_64/kernel/pci-nommu.c +++ b/arch/x86_64/kernel/pci-nommu.c @@ -12,9 +12,10 @@ static int check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size) { if (hwdev && bus + size > *hwdev->dma_mask) { - printk(KERN_ERR - "nommu_%s: overflow %Lx+%lu of device mask %Lx\n", - name, (long long)bus, size, (long long)*hwdev->dma_mask); + if (*hwdev->dma_mask >= 0xffffffffULL) + printk(KERN_ERR + "nommu_%s: overflow %Lx+%lu of device mask %Lx\n", + name, (long long)bus, size, (long long)*hwdev->dma_mask); return 0; } return 1; |