diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c
index 3cc94ff..6ccb4b6 100644
--- a/linux-core/drm_agpsupport.c
+++ b/linux-core/drm_agpsupport.c
@@ -517,7 +517,7 @@ drm_agp_bind_pages(struct drm_device *dev,
 		mem->memory[i] = phys_to_gart(page_to_phys(pages[i]));
 	mem->page_count = num_pages;
 
-	mem->is_flushed = true;
+	mem->is_flushed = TRUE;
 	ret = drm_agp_bind_memory(mem, gtt_offset / PAGE_SIZE);
 	if (ret != 0) {
 		DRM_ERROR("Failed to bind AGP memory: %d\n", ret);
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c
index 2126a60..80a8ff5 100644
--- a/linux-core/drm_ttm.c
+++ b/linux-core/drm_ttm.c
@@ -72,7 +72,7 @@ void drm_ttm_cache_flush(struct page *pages[], unsigned long num_pages)
 		return;
 	}
 #endif
-	if (on_each_cpu(drm_ttm_ipi_handler, NULL, 1) != 0)
+	if (on_each_cpu(drm_ttm_ipi_handler, NULL, 1, 1) != 0)
 		DRM_ERROR("Timed out waiting for drm cache flush.\n");
 }
 EXPORT_SYMBOL(drm_ttm_cache_flush);
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index 2601550..6618c0a 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -699,10 +699,6 @@ EXPORT_SYMBOL(drm_mmap);
  */
 
 #ifdef DRM_FULL_MM_COMPAT
-# define NOPFN_SIGBUS    ((unsigned long) -1)
-# define NOPFN_OOM       ((unsigned long) -2)
-# define NOPFN_REFAULT   ((unsigned long) -3)
-
 static unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma,
 				     unsigned long address)
 {
@@ -853,7 +849,7 @@ static void drm_bo_vm_close(struct vm_area_struct *vma)
 
 static struct vm_operations_struct drm_bo_vm_ops = {
 #ifdef DRM_FULL_MM_COMPAT
-	//.nopfn = drm_bo_vm_nopfn,
+	.nopfn = drm_bo_vm_nopfn,
 #else
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
 	.nopfn = drm_bo_vm_nopfn,