From bf2e0474e5d846d95bf461e91947adb9e4e9035d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 16 Oct 2012 10:28:21 +1000 Subject: [PATCH] --- yaml --- r: 334403 b: refs/heads/master c: 7b8505300525d7e802ecf52ae160bc63f4ba28d7 h: refs/heads/master i: 334401: e0129b5cbccef90ff03cf743736b29acb1c36ae7 334399: 81eba23f403b2e45b4de3b675c948225bf07797d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_info.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 49a0407b5f5d..712c25870545 100644 --- 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 index cdf8b1e7602d..441ebc1bdbef 100644 --- 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;