summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libdrm/xf86drm.c2
-rw-r--r--libdrm/xf86drmCompat.c2
-rw-r--r--linux-core/Makefile.kernel2
-rw-r--r--linux-core/ati_pcigart.c2
-rw-r--r--linux-core/drm_vm.c4
-rw-r--r--linux/Makefile.kernel2
-rw-r--r--linux/Makefile.linux9
-rw-r--r--linux/ati_pcigart.h2
-rw-r--r--linux/drm_vm.h4
9 files changed, 18 insertions, 11 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 75a90825..6d5f4a6f 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -31,7 +31,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.31 2003/02/04 03:01:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.36 2003/08/24 17:35:35 tsi Exp $ */
#ifdef XFree86Server
# include "xf86.h"
diff --git a/libdrm/xf86drmCompat.c b/libdrm/xf86drmCompat.c
index 4e3ccf3f..9263ec4d 100644
--- a/libdrm/xf86drmCompat.c
+++ b/libdrm/xf86drmCompat.c
@@ -26,7 +26,7 @@
* Jens Owen <jens@tungstengraphics.com>
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.4 2001/08/27 17:40:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c,v 1.1 2002/10/30 12:52:33 alanh Exp $ */
#ifdef XFree86Server
# include "xf86.h"
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;
diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel
index e5abd4d3..fb39e636 100644
--- a/linux/Makefile.kernel
+++ b/linux/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/Makefile.linux b/linux/Makefile.linux
index 9de67667..12e0e8c8 100644
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -11,7 +11,7 @@
# everything required for in-kernel source builds. It is included into
# this file, so none of that should be duplicated here.
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.37 2003/04/23 01:48:57 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.linux,v 1.40 2003/08/17 17:12:25 dawes Exp $
#
#
@@ -48,6 +48,7 @@ MODULE_LIST := gamma.o tdfx.o r128.o radeon.o mga.o sis.o
# Modules only for ix86 architectures
ifneq (,$(findstring 86,$(MACHINE)))
+ARCHX86 := 1
MODULE_LIST += i830.o i810.o
endif
@@ -258,6 +259,12 @@ $(error Only 2.4.x and later kernels are supported \
($(VERSION).$(PATCHLEVEL).$(SUBLEVEL)))
endif
+ifdef ARCHX86
+ifndef CONFIG_X86_CMPXCHG
+$(error CONFIG_X86_CMPXCHG needs to be enabled in the kernel)
+endif
+endif
+
# This needs to go before all other include paths.
CC += -I$(DRMSRCDIR)
diff --git a/linux/ati_pcigart.h b/linux/ati_pcigart.h
index 42233ff9..221ceb6d 100644
--- a/linux/ati_pcigart.h
+++ b/linux/ati_pcigart.h
@@ -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/drm_vm.h b/linux/drm_vm.h
index 29cad56d..8f4679f9 100644
--- a/linux/drm_vm.h
+++ b/linux/drm_vm.h
@@ -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;