diff options
| author | Patrice Mandin <pmandin@caramail.com> | 2008-02-29 21:57:40 +0100 |
|---|---|---|
| committer | Patrice Mandin <pmandin@caramail.com> | 2008-02-29 21:57:40 +0100 |
| commit | 09999c90ab1bf3f7d8b277895c962c8a7b3afc18 (patch) | |
| tree | 95532b65695b840b213526de40bcfd959c258ae3 | |
| parent | 1d068973d5f5e6d8d14b4c0c6e28588107aafc6f (diff) | |
FIX_KMAP_BEGIN requires CONFIG_HIMEM (see include/asm-i386.h/fixmap.h)
| -rw-r--r-- | linux-core/drm_compat.c | 2 | ||||
| -rw-r--r-- | linux-core/drm_compat.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_compat.c b/linux-core/drm_compat.c index eb6c5d81..d4044cbd 100644 --- a/linux-core/drm_compat.c +++ b/linux-core/drm_compat.c @@ -730,7 +730,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id) EXPORT_SYMBOL(idr_replace); #endif -#if defined(DRM_KMAP_ATOMIC_PROT_PFN) +#if defined(DRM_KMAP_ATOMIC_PROT_PFN) && defined(CONFIG_HIMEM) #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 08892e6b..136a7296 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) && defined(CONFIG_X86_32)) +#if (defined(CONFIG_X86) && defined(CONFIG_X86_32) && defined(CONFIG_HIMEM)) #define DRM_KMAP_ATOMIC_PROT_PFN extern void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t protection); |