From 43b597f8466a953eee33d99b51b90eb3811fb47f Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Wed, 18 Feb 2004 16:18:07 +0000 Subject: [PATCH] fixed the xfree86 imstt driver the right way git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2370 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xfree86/imst.patch | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/package/x11/xfree86/imst.patch b/package/x11/xfree86/imst.patch index 5c2678cc9..863e09db3 100644 --- a/package/x11/xfree86/imst.patch +++ b/package/x11/xfree86/imst.patch @@ -17,28 +17,23 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- ---- xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h 2002-08-06 19:57:30.000000000 +0000 -+++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h 2003-04-08 22:10:30.000000000 +0000 -@@ -9,22 +9,11 @@ +--- xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h.orig 2002-08-06 21:57:30.000000000 +0200 ++++ xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h 2004-02-18 16:24:47.000000000 +0100 +@@ -9,7 +9,7 @@ static __inline__ void regw(unsigned long base_addr, unsigned long regindex, unsigned long regdata) { - asm volatile ("stwbrx %1,%2,%3; eieio" -- : "=m" (*(volatile unsigned *)(base_addr+regindex)) -- : "r" (regdata), "b" (regindex), "r" (base_addr)); ++ __asm__ __volatile__ ("stwbrx %1,%2,%3; eieio" + : "=m" (*(volatile unsigned *)(base_addr+regindex)) + : "r" (regdata), "b" (regindex), "r" (base_addr)); } - - - static __inline__ unsigned long regr(unsigned long base_addr, unsigned long regindex) +@@ -19,7 +19,7 @@ { -- register unsigned long val; -- -- asm volatile ("lwbrx %0,%1,%2; eieio" -- : "=r" (val) -- : "b" (regindex), "r" (base_addr), -- "m" (*(volatile unsigned *)(base_addr+regindex))); -- -- return (val); - } - + register unsigned long val; +- asm volatile ("lwbrx %0,%1,%2; eieio" ++ __asm__ __volatile__ ("lwbrx %0,%1,%2; eieio" + : "=r" (val) + : "b" (regindex), "r" (base_addr), + "m" (*(volatile unsigned *)(base_addr+regindex)));