summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2008-02-29 13:31:14 +0100
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2008-02-29 13:32:25 +0100
commit1d068973d5f5e6d8d14b4c0c6e28588107aafc6f (patch)
tree57988122e08b0e29cfe8ef24b7722dbc32274854
parentcdbd616ea5f0ee491ff82cac74b918a14b039917 (diff)
Fix compilation breakage on x86-64.
-rw-r--r--linux-core/drm_compat.c3
-rw-r--r--linux-core/drm_compat.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/drm_compat.c b/linux-core/drm_compat.c
index 32e43a0a..eb6c5d81 100644
--- a/linux-core/drm_compat.c
+++ b/linux-core/drm_compat.c
@@ -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))
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index 39027cf4..08892e6b 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -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);