rpms/kernel/devel kernel.spec, 1.366, 1.367 linux-2.6-drm-mm.patch, 1.4, 1.5

[Kyle McMartin (kyle)]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31919

Modified Files:
	kernel.spec linux-2.6-drm-mm.patch 
Log Message:
* Thu Jan 17 2008 Kyle McMartin <kmcmartin at redhat.com>
- update linux-2.6-drm-mm.patch, need to use wbinvd on cpus which
  don't support clflush (otherwise we get a nasty invalid op oops.)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- kernel.spec	17 Jan 2008 18:47:15 -0000	1.366
+++ kernel.spec	17 Jan 2008 23:22:49 -0000	1.367
@@ -1757,6 +1757,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Jan 17 2008 Kyle McMartin <kmcmartin at redhat.com>
+- update linux-2.6-drm-mm.patch, need to use wbinvd on cpus which
+  don't support clflush (otherwise we get a nasty invalid op oops.)
+
 * Thu Jan 17 2008 John W. Linville <linville at redhat.com>
 - More wireless fixes headed for 2.6.24
 - More wireless updates headed for 2.6.25

linux-2.6-drm-mm.patch:

Index: linux-2.6-drm-mm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-drm-mm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-drm-mm.patch	19 Dec 2007 03:50:12 -0000	1.4
+++ linux-2.6-drm-mm.patch	17 Jan 2008 23:22:49 -0000	1.5
@@ -7999,7 +7999,7 @@
 index 0000000..a120bfc
 --- /dev/null
 +++ b/drivers/char/drm/i915_buffer.c
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,186 @@
 +/**************************************************************************
 + *
 + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA
@@ -8171,8 +8171,19 @@
 +		return;
 +
 +	DRM_MEMORYBARRIER();
++
++#ifdef CONFIG_X86_32
++	/* Hopefully nobody has built an x86-64 processor without clflush */
++	if (!cpu_has_clflush) {
++		wbinvd();
++		DRM_MEMORYBARRIER();
++		return;
++	}
++#endif
++
 +	for (i = ttm->num_pages - 1; i >= 0; i--)
 +		drm_cache_flush_page(drm_ttm_get_page(ttm, i));
++
 +	DRM_MEMORYBARRIER();
 +}
 diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c