diff --git a/[refs] b/[refs] index 6e4d1fa43c3d..26e964659eaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f011ae7437761dc071b4154cabb0041df041a7c0 +refs/heads/master: bc894606e8843808c232319f69c26c18f6eaa662 diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c index fe6fc382190f..eeea50a1d22a 100644 --- a/trunk/drivers/char/agp/intel-agp.c +++ b/trunk/drivers/char/agp/intel-agp.c @@ -597,7 +597,6 @@ static void intel_i830_fini_flush(void) kunmap(intel_private.i8xx_page); intel_private.i8xx_flush_page = NULL; unmap_page_from_agp(intel_private.i8xx_page); - flush_agp_mappings(); __free_page(intel_private.i8xx_page); intel_private.i8xx_page = NULL; @@ -615,7 +614,6 @@ static void intel_i830_setup_flush(void) /* make page uncached */ map_page_into_agp(intel_private.i8xx_page); - flush_agp_mappings(); intel_private.i8xx_flush_page = kmap(intel_private.i8xx_page); if (!intel_private.i8xx_flush_page)