Index: exa.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/exa/exa.c,v
retrieving revision 1.46
diff -u -r1.46 exa.c
--- exa.c	18 Apr 2006 19:14:07 -0000	1.46
+++ exa.c	27 Apr 2006 20:39:13 -0000
@@ -32,6 +32,10 @@
 #include <dix-config.h>
 #endif
 
+#ifdef MITSHM
+#include "shmint.h"
+#endif
+
 #include <stdlib.h>
 
 #include "exa_priv.h"
@@ -605,6 +609,13 @@
 
     miDisableCompositeWrapper(pScreen);
 
+#ifdef MITSHM
+    /* Re-register with the MI funcs, which don't allow shared pixmaps.
+     * Shared pixmaps are almost always a performance loss for us, but this
+     * still allows for SHM PutImage.
+     */
+    ShmRegisterFuncs(pScreen, NULL);
+#endif
     /*
      * Hookup offscreen pixmaps
      */