Fix compilation breakage on x86-64.
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Fri, 29 Feb 2008 12:31:14 +0000 (13:31 +0100)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Fri, 29 Feb 2008 12:32:25 +0000 (13:32 +0100)
linux-core/drm_compat.c
linux-core/drm_compat.h

index 32e43a0..eb6c5d8 100644 (file)
@@ -730,8 +730,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
 EXPORT_SYMBOL(idr_replace);
 #endif
 
-#if defined(CONFIG_X86)
-
+#if defined(DRM_KMAP_ATOMIC_PROT_PFN)
 #define drm_kmap_get_fixmap_pte(vaddr)                                 \
        pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), vaddr), (vaddr)), (vaddr))
 
index 39027cf..08892e6 100644 (file)
@@ -328,7 +328,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id);
 typedef _Bool                   bool;
 #endif
 
-#if defined(CONFIG_X86)
+#if (defined(CONFIG_X86) && defined(CONFIG_X86_32))
 #define DRM_KMAP_ATOMIC_PROT_PFN
 extern void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type,
                                  pgprot_t protection);