From 597f8c2603a3e73235a2e3ea2970eeed4305e027 Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Wed, 21 Sep 2005 18:38:09 +0200 Subject: [PATCH] --- yaml --- r: 9173 b: refs/heads/master c: 676067cfeaa16f6f338e067e83ce4733b41c0b24 h: refs/heads/master i: 9171: 38e27e963bf84dcddf28c0cb67d75a626c86a4c2 v: v3 --- [refs] | 2 +- trunk/include/asm-alpha/futex.h | 2 +- trunk/include/asm-arm26/futex.h | 2 +- trunk/include/asm-cris/futex.h | 2 +- trunk/include/asm-frv/futex.h | 2 +- trunk/include/asm-h8300/futex.h | 2 +- trunk/include/asm-ia64/futex.h | 2 +- trunk/include/asm-m32r/futex.h | 2 +- trunk/include/asm-m68k/futex.h | 2 +- trunk/include/asm-m68knommu/futex.h | 2 +- trunk/include/asm-parisc/futex.h | 2 +- trunk/include/asm-ppc/futex.h | 2 +- trunk/include/asm-s390/futex.h | 2 +- trunk/include/asm-sh/futex.h | 2 +- trunk/include/asm-sh64/futex.h | 2 +- trunk/include/asm-sparc/futex.h | 2 +- trunk/include/asm-sparc64/futex.h | 2 +- trunk/include/asm-v850/futex.h | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 5f4cc6661774..d2e47fa52144 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c51179fb0c77ad91df5825f8f7eb670da97e137e +refs/heads/master: 676067cfeaa16f6f338e067e83ce4733b41c0b24 diff --git a/trunk/include/asm-alpha/futex.h b/trunk/include/asm-alpha/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-alpha/futex.h +++ b/trunk/include/asm-alpha/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-arm26/futex.h b/trunk/include/asm-arm26/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-arm26/futex.h +++ b/trunk/include/asm-arm26/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-cris/futex.h b/trunk/include/asm-cris/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-cris/futex.h +++ b/trunk/include/asm-cris/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-frv/futex.h b/trunk/include/asm-frv/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-frv/futex.h +++ b/trunk/include/asm-frv/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-h8300/futex.h b/trunk/include/asm-h8300/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-h8300/futex.h +++ b/trunk/include/asm-h8300/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-ia64/futex.h b/trunk/include/asm-ia64/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-ia64/futex.h +++ b/trunk/include/asm-ia64/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-m32r/futex.h b/trunk/include/asm-m32r/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-m32r/futex.h +++ b/trunk/include/asm-m32r/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-m68k/futex.h b/trunk/include/asm-m68k/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-m68k/futex.h +++ b/trunk/include/asm-m68k/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-m68knommu/futex.h b/trunk/include/asm-m68knommu/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-m68knommu/futex.h +++ b/trunk/include/asm-m68knommu/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-parisc/futex.h b/trunk/include/asm-parisc/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-parisc/futex.h +++ b/trunk/include/asm-parisc/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-ppc/futex.h b/trunk/include/asm-ppc/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-ppc/futex.h +++ b/trunk/include/asm-ppc/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-s390/futex.h b/trunk/include/asm-s390/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-s390/futex.h +++ b/trunk/include/asm-s390/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-sh/futex.h b/trunk/include/asm-sh/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-sh/futex.h +++ b/trunk/include/asm-sh/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-sh64/futex.h b/trunk/include/asm-sh64/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-sh64/futex.h +++ b/trunk/include/asm-sh64/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-sparc/futex.h b/trunk/include/asm-sparc/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-sparc/futex.h +++ b/trunk/include/asm-sparc/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-sparc64/futex.h b/trunk/include/asm-sparc64/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-sparc64/futex.h +++ b/trunk/include/asm-sparc64/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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; diff --git a/trunk/include/asm-v850/futex.h b/trunk/include/asm-v850/futex.h index 2cac5ecd9d00..9feff4ce1424 100644 --- a/trunk/include/asm-v850/futex.h +++ b/trunk/include/asm-v850/futex.h @@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 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;