From 584548815efe7182378aa1e09d6acac710f74899 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Tue, 2 Nov 2010 17:30:47 +0800 Subject: [PATCH] --- yaml --- r: 221771 b: refs/heads/master c: 8d0f56708292ca5c256ee3b7187d124afee81d93 h: refs/heads/master i: 221769: 8ea2f99f7e4a23368a16def27900aa57e5077081 221767: 85a5d3c18eef8ac02f7f820ee68474de65cfae3a v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-gtt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 21402df2917a..e070cfb455aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e07ac3a0b17ed9dec26b742ea41514063ef12386 +refs/heads/master: 8d0f56708292ca5c256ee3b7187d124afee81d93 diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c index 6b6760ea2435..791216d33ed0 100644 --- a/trunk/drivers/char/agp/intel-gtt.c +++ b/trunk/drivers/char/agp/intel-gtt.c @@ -1210,7 +1210,7 @@ static void gen6_write_entry(dma_addr_t addr, unsigned int entry, unsigned int gfdt = flags & AGP_USER_CACHED_MEMORY_GFDT; u32 pte_flags; - if (type_mask == AGP_USER_UNCACHED_MEMORY) + if (type_mask == AGP_USER_MEMORY) pte_flags = GEN6_PTE_UNCACHED | I810_PTE_VALID; else if (type_mask == AGP_USER_CACHED_MEMORY_LLC_MLC) { pte_flags = GEN6_PTE_LLC | I810_PTE_VALID;