From a76a8bc210c8ba84e5ed4a90a442c2d31250ab52 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 11 Sep 2008 23:08:47 +0900 Subject: [PATCH] --- yaml --- r: 112589 b: refs/heads/master c: f10ac8a232496bf9271cfc67c6eea432891f04a6 h: refs/heads/master i: 112587: c01102b5bea410560fc51973814ede7ac2f29a47 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-calgary_64.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d832b592c25e..219bbd4b898e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bee44f294efd8417f5e68553778a6cc957af1547 +refs/heads/master: f10ac8a232496bf9271cfc67c6eea432891f04a6 diff --git a/trunk/arch/x86/kernel/pci-calgary_64.c b/trunk/arch/x86/kernel/pci-calgary_64.c index 8415d92853c4..fe7695e4caae 100644 --- a/trunk/arch/x86/kernel/pci-calgary_64.c +++ b/trunk/arch/x86/kernel/pci-calgary_64.c @@ -491,6 +491,8 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size, npages = size >> PAGE_SHIFT; order = get_order(size); + flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); + /* alloc enough pages (and possibly more) */ ret = (void *)__get_free_pages(flag, order); if (!ret)