]> xenbits.xensource.com Git - people/aperard/linux-chromebook.git/commitdiff
BACKPORT: drm: fix warning on 32-bit.
authorDave Airlie <airlied@redhat.com>
Tue, 16 Oct 2012 00:28:21 +0000 (10:28 +1000)
committerChromeBot <chrome-bot@google.com>
Thu, 31 Jan 2013 19:09:00 +0000 (11:09 -0800)
This cast was causing a warning on 32-bit builds.

BUG=chromium-os:5542
TEST=emerge-x86-generic chromeos-kernel, make sure this warning doesn't
show up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from 7b8505300525d7e802ecf52ae160bc63f4ba28d7)

Change-Id: Ib08213c370525ce23fb0505c7e21439f257a813c
Signed-off-by: Simon Que <sque@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/41562
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
drivers/gpu/drm/drm_info.c

index ab1162da70f83e7ede2df4f49965ad37a73df95e..e29bde07216eb3503a173ab8b4f19664e0ca4d6b 100644 (file)
@@ -274,7 +274,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;