From c5168016cc028f59b417df77f1f169bf06e40271 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 12 Sep 2003 20:00:59 +0000
Subject: linux drm fixes

---
 linux-core/Makefile.kernel | 2 +-
 linux-core/ati_pcigart.c   | 2 +-
 linux-core/drm_vm.c        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'linux-core')

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index e5abd4d3..fb39e636 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -4,7 +4,7 @@
 #
 # Based on David Woodhouse's mtd build.
 #
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.17 2003/04/12 17:18:17 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.18 2003/08/16 17:59:17 dawes Exp $
 #
 
 gamma-objs  := gamma_drv.o gamma_dma.o
diff --git a/linux-core/ati_pcigart.c b/linux-core/ati_pcigart.c
index 42233ff9..221ceb6d 100644
--- a/linux-core/ati_pcigart.c
+++ b/linux-core/ati_pcigart.c
@@ -158,7 +158,7 @@ int DRM(ati_pcigart_init)( drm_device_t *dev,
 
 	ret = 1;
 
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__AMD64__)
 	asm volatile ( "wbinvd" ::: "memory" );
 #else
 	mb();
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index 29cad56d..8f4679f9 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -511,7 +511,7 @@ int DRM(mmap)(struct file *filp, struct vm_area_struct *vma)
 
 	if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) {
 		vma->vm_flags &= ~(VM_WRITE | VM_MAYWRITE);
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__AMD64__)
 		pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
 #else
 				/* Ye gads this is ugly.  With more thought
@@ -542,7 +542,7 @@ int DRM(mmap)(struct file *filp, struct vm_area_struct *vma)
 	case _DRM_FRAME_BUFFER:
 	case _DRM_REGISTERS:
 		if (VM_OFFSET(vma) >= __pa(high_memory)) {
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__AMD64__)
 			if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
 				pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
 				pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
-- 
cgit v1.2.3