rpms/kernel/devel linux-2.6-ia64-futex.patch,1.1.2.1,1.1.2.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8264

Modified Files:
      Tag: private-ia64-futex-branch
	linux-2.6-ia64-futex.patch 
Log Message:
make it actually build

linux-2.6-ia64-futex.patch:
 futex.h |  121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 119 insertions(+), 2 deletions(-)

Index: linux-2.6-ia64-futex.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-ia64-futex.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-ia64-futex.patch	15 Sep 2006 12:53:40 -0000	1.1.2.1
+++ linux-2.6-ia64-futex.patch	15 Sep 2006 15:27:05 -0000	1.1.2.2
@@ -2,7 +2,7 @@
 index 6a332a9..53c7356 100644
 --- a/include/asm-ia64/futex.h
 +++ b/include/asm-ia64/futex.h
-@@ -1,6 +1,124 @@
+@@ -1,6 +1,123 @@
  #ifndef _ASM_FUTEX_H
  #define _ASM_FUTEX_H
  
@@ -59,7 +59,7 @@
 +	int cmp = (encoded_op >> 24) & 15;
 +	int oparg = (encoded_op << 8) >> 20;
 +	int cmparg = (encoded_op << 20) >> 20;
-+	int oldval = 0, ret, tem;
++	int oldval = 0, ret;
 +	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
 +		oparg = 1 << oparg;
 +
@@ -74,8 +74,7 @@
 +				   oparg);
 +		break;
 +	case FUTEX_OP_ADD:
-+		__futex_atomic_op1("fetchadd4.acq %1=[%2],%3", ret, oldval,
-+				   uaddr, oparg);
++		__futex_atomic_op2("add %3=%3,%5", ret, oldval, uaddr, oparg);
 +		break;
 +	case FUTEX_OP_OR:
 +		__futex_atomic_op2("or %3=%3,%5", ret, oldval, uaddr, oparg);