summaryrefslogtreecommitdiff
path: root/drivers/char/agp/nvidia-agp.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-23 13:11:42 +0400
committerIngo Molnar <mingo@elte.hu>2008-06-23 13:11:42 +0400
commitf34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d (patch)
tree0816c565d26ae24854616faa0d497be365c2fe8b /drivers/char/agp/nvidia-agp.c
parentee4311adf105f4d740f52e3948acc1d81598afcc (diff)
parent481c5346d0981940ee63037eb53e4e37b0735c10 (diff)
downloadlinux-f34bfb1beef8a17ba3d46b60f8fa19ffedc1ed8d.tar.xz
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'drivers/char/agp/nvidia-agp.c')
-rw-r--r--drivers/char/agp/nvidia-agp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index 225ed2a53d45..eaceb61ba2dc 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,