diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 21:52:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-18 21:52:35 -0700 |
commit | 3506ba7b082f9330657b3386c98246d5fda6c698 (patch) | |
tree | 52bddb8c38a5065002769842d53a9f75ac96f20b /drivers/char/agp/nvidia-agp.c | |
parent | f9d1c6ca2bb1bbfde4a95d9e55ab3b0126825295 (diff) | |
parent | 62c96b9d0917894c164aa3e474a3ff3bca1554ae (diff) | |
download | kernel_goldelico_gta04-3506ba7b082f9330657b3386c98246d5fda6c698.zip kernel_goldelico_gta04-3506ba7b082f9330657b3386c98246d5fda6c698.tar.gz kernel_goldelico_gta04-3506ba7b082f9330657b3386c98246d5fda6c698.tar.bz2 |
Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
agp/intel: cleanup some serious whitespace badness
[AGP] intel_agp: Add support for Intel 4 series chipsets
[AGP] intel_agp: extra stolen mem size available for IGD_GM chipset
agp: more boolean conversions.
drivers/char/agp - use bool
agp: two-stage page destruction issue
agp/via: fixup pci ids
Diffstat (limited to 'drivers/char/agp/nvidia-agp.c')
-rw-r--r-- | drivers/char/agp/nvidia-agp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c index 225ed2a..eaceb61 100644 --- a/drivers/char/agp/nvidia-agp.c +++ b/drivers/char/agp/nvidia-agp.c @@ -214,9 +214,9 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type return -EBUSY; } - if (mem->is_flushed == FALSE) { + if (!mem->is_flushed) { global_cache_flush(); - mem->is_flushed = TRUE; + mem->is_flushed = true; } for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { writel(agp_bridge->driver->mask_memory(agp_bridge, |