Merge branch 'linus' into x86/nmi

1 files changed, 19 insertions, 16 deletions

diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 7fc0c99a3a5..564daaa6c7d 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -96,13 +96,13 @@ EXPORT_SYMBOL(agp_flush_chipset);
 void agp_alloc_page_array(size_t size, struct agp_memory *mem)
 {
         mem->memory = NULL;
-        mem->vmalloc_flag = 0;
+        mem->vmalloc_flag = false;
 
         if (size <= 2*PAGE_SIZE)
                 mem->memory = kmalloc(size, GFP_KERNEL | __GFP_NORETRY);
         if (mem->memory == NULL) {
                 mem->memory = vmalloc(size);
-                mem->vmalloc_flag = 1;
+                mem->vmalloc_flag = true;
         }
 }
 EXPORT_SYMBOL(agp_alloc_page_array);
@@ -188,7 +188,7 @@ void agp_free_memory(struct agp_memory *curr)
         if (curr == NULL)
                 return;
 
-        if (curr->is_bound == TRUE)
+        if (curr->is_bound)
                 agp_unbind_memory(curr);
 
         if (curr->type >= AGP_USER_TYPES) {
@@ -202,10 +202,13 @@ void agp_free_memory(struct agp_memory *curr)
         }
         if (curr->page_count != 0) {
                 for (i = 0; i < curr->page_count; i++) {
-                        curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_UNMAP);
+                        curr->memory[i] = (unsigned long)gart_to_virt(curr->memory[i]);
+                        curr->bridge->driver->agp_destroy_page((void *)curr->memory[i],
+                                                               AGP_PAGE_DESTROY_UNMAP);
                 }
                 for (i = 0; i < curr->page_count; i++) {
-                        curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_FREE);
+                        curr->bridge->driver->agp_destroy_page((void *)curr->memory[i],
+                                                               AGP_PAGE_DESTROY_FREE);
                 }
         }
         agp_free_key(curr->key);
@@ -411,20 +414,20 @@ int agp_bind_memory(struct agp_memory *curr, off_t pg_start)
         if (curr == NULL)
                 return -EINVAL;
 
-        if (curr->is_bound == TRUE) {
+        if (curr->is_bound) {
                 printk(KERN_INFO PFX "memory %p is already bound!\n", curr);
                 return -EINVAL;
         }
-        if (curr->is_flushed == FALSE) {
+        if (!curr->is_flushed) {
                 curr->bridge->driver->cache_flush();
-                curr->is_flushed = TRUE;
+                curr->is_flushed = true;
         }
         ret_val = curr->bridge->driver->insert_memory(curr, pg_start, curr->type);
 
         if (ret_val != 0)
                 return ret_val;
 
-        curr->is_bound = TRUE;
+        curr->is_bound = true;
         curr->pg_start = pg_start;
         return 0;
 }
@@ -446,7 +449,7 @@ int agp_unbind_memory(struct agp_memory *curr)
         if (curr == NULL)
                 return -EINVAL;
 
-        if (curr->is_bound != TRUE) {
+        if (!curr->is_bound) {
                 printk(KERN_INFO PFX "memory %p was not bound!\n", curr);
                 return -EINVAL;
         }
@@ -456,7 +459,7 @@ int agp_unbind_memory(struct agp_memory *curr)
         if (ret_val != 0)
                 return ret_val;
 
-        curr->is_bound = FALSE;
+        curr->is_bound = false;
         curr->pg_start = 0;
         return 0;
 }
@@ -754,7 +757,7 @@ u32 agp_collect_device_status(struct agp_bridge_data *bridge, u32 requested_mode
 EXPORT_SYMBOL(agp_collect_device_status);
 
 
-void agp_device_command(u32 bridge_agpstat, int agp_v3)
+void agp_device_command(u32 bridge_agpstat, bool agp_v3)
 {
         struct pci_dev *device = NULL;
         int mode;
@@ -818,7 +821,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode)
                         /* If we have 3.5, we can do the isoch stuff. */
                         if (bridge->minor_version >= 5)
                                 agp_3_5_enable(bridge);
-                        agp_device_command(bridge_agpstat, TRUE);
+                        agp_device_command(bridge_agpstat, true);
                         return;
                 } else {
                     /* Disable calibration cycle in RX91<1> when not in AGP3.0 mode of operation.*/
@@ -835,7 +838,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode)
         }
 
         /* AGP v<3 */
-        agp_device_command(bridge_agpstat, FALSE);
+        agp_device_command(bridge_agpstat, false);
 }
 EXPORT_SYMBOL(agp_generic_enable);
 
@@ -1083,9 +1086,9 @@ int agp_generic_insert_memory(struct agp_memory * mem, off_t pg_start, int type)
                 j++;
         }
 
-        if (mem->is_flushed == FALSE) {
+        if (!mem->is_flushed) {
                 bridge->driver->cache_flush();
-                mem->is_flushed = TRUE;
+                mem->is_flushed = true;
         }
 
         for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {