xserver: Branch 'master'

[Julien Cristau]

On Mon, Aug 31, 2009 at 17:25:21 -0700, Matt Turner wrote:

> commit 5ef53a94ce4e48e11de26290cd677266308640c8
> Author: Matt Turner <mattst88 at gmail.com>
> Date:   Mon Aug 31 20:23:26 2009 -0400
> 
>     alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus
>     
>     xf86SlowBCopyToBus and xf86SlowBCopyFromBus cause segfaults on my
>     system.
>     
>     Also remove associated slowbcopy_tobus/slowbcopy_frombus macros.
>     
>     Signed-off-by: Matt Turner <mattst88 at gmail.com>
> 
> diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
> index b2301e7..95ef72c 100644
> --- a/hw/xfree86/common/compiler.h
> +++ b/hw/xfree86/common/compiler.h
[...]
> @@ -1342,18 +1340,4 @@ extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
>  #  define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)
>  
>  # endif /* __alpha__ */
> -
> -/*
> - * With Intel, the version in os-support/misc/SlowBcopy.s is used.
> - * This avoids port I/O during the copy (which causes problems with
> - * some hardware).
> - */
> -# ifdef __alpha__
> -#  define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)
> -#  define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)
> -# else /* __alpha__ */
> -#  define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)
> -#  define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)
> -# endif /* __alpha__ */
> -
>  #endif /* _COMPILER_H */

This breaks the vesa driver, which uses that macro.  So please either
put the macro back, or fix the drivers.

Cheers,
Julien