---

yaml --- r: 334403 b: refs/heads/master c: 7b85053 h: refs/heads/master i: 334401: e0129b5 334399: 81eba23 v: v3
git-mirror · Oct 16, 2012 · bf2e047 · bf2e047
1 parent 319c089
commit bf2e047
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd6126bd0766cb0e03a4d832cc3611dff5ea8e50
+refs/heads/master: 7b8505300525d7e802ecf52ae160bc63f4ba28d7
diff --git a/trunk/drivers/gpu/drm/drm_info.c b/trunk/drivers/gpu/drm/drm_info.c
@@ -239,7 +239,7 @@ int drm_vma_info(struct seq_file *m, void *data)
 	mutex_lock(&dev->struct_mutex);
 	seq_printf(m, "vma use count: %d, high_memory = %pK, 0x%pK\n",
 		   atomic_read(&dev->vma_count),
-		   high_memory, (void *)virt_to_phys(high_memory));
+		   high_memory, (void *)(unsigned long)virt_to_phys(high_memory));
 
 	list_for_each_entry(pt, &dev->vmalist, head) {
 		vma = pt->vma;