From 20c1496f682c8a4196aaaa2c50dda72e59b116bb Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Wed, 9 Apr 2008 13:18:07 -0300 Subject: [PATCH] --- yaml --- r: 91039 b: refs/heads/master c: aa99b16faadcc9a5b6bd9550fda117a8e9e46d26 h: refs/heads/master i: 91037: e5d1c929784ac82686cbed602b050fb42336eff1 91035: 1d777dfb79dce5b1881d57103ea8e81c5ca0bac3 91031: 37114819e1073f760ed8ac9231db8557b05c44df 91023: e156032d7767a504ee902f63e278a4bc44d9fe5e 91007: dbd86edd0a38e8c91c664459f1d3e8ad062bb7c2 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-dma_64.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fd303bbcb79f..b87bc707a1b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f19ca1341a6d89bd96e2e69e6e10f46d3258089 +refs/heads/master: aa99b16faadcc9a5b6bd9550fda117a8e9e46d26 diff --git a/trunk/arch/x86/kernel/pci-dma_64.c b/trunk/arch/x86/kernel/pci-dma_64.c index b956f5945d67..596c8c88f36d 100644 --- a/trunk/arch/x86/kernel/pci-dma_64.c +++ b/trunk/arch/x86/kernel/pci-dma_64.c @@ -68,10 +68,6 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, /* Don't invoke OOM killer */ gfp |= __GFP_NORETRY; - /* Kludge to make it bug-to-bug compatible with i386. i386 - uses the normal dma_mask for alloc_coherent. */ - dma_mask &= *dev->dma_mask; - /* Why <=? Even when the mask is smaller than 4GB it is often larger than 16MB and in this case we have a chance of finding fitting memory in the next higher zone first. If