Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] wire up sendmmsg syscall
  [PARISC] fix return type of __atomic64_add_return
  [PARISC] Fix futex support

diff --combined arch/parisc/include/asm/atomic.h
index b1dc71f,26fd114..4054b31
--- 1/arch/parisc/include/asm/atomic.h
--- 2/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@@ -197,15 -197,15 +197,15 @@@ static __inline__ int atomic_read(cons
  #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
  
  /**
 - * atomic_add_unless - add unless the number is a given value
 + * __atomic_add_unless - add unless the number is a given value
   * @v: pointer of type atomic_t
   * @a: the amount to add to v...
   * @u: ...unless v is equal to u.
   *
   * Atomically adds @a to @v, so long as it was not @u.
 - * Returns non-zero if @v was not @u, and zero otherwise.
 + * Returns the old value of @v.
   */
 -static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 +static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
  {
        int c, old;
        c = atomic_read(v);
@@@ -217,9 -217,10 +217,9 @@@
                        break;
                c = old;
        }
 -      return c != (u);
 +      return c;
  }
  
 -#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
  
  #define atomic_add(i,v)       ((void)(__atomic_add_return( (i),(v))))
  #define atomic_sub(i,v)       ((void)(__atomic_add_return(-(i),(v))))
@@@ -258,10 -259,10 +258,10 @@@
  
  #define ATOMIC64_INIT(i) ((atomic64_t) { (i) })
  
- static __inline__ int
+ static __inline__ s64
  __atomic64_add_return(s64 i, atomic64_t *v)
  {
-       int ret;
+       s64 ret;
        unsigned long flags;
        _atomic_spin_lock_irqsave(v, flags);
  
@@@ -316,7 -317,7 +316,7 @@@ atomic64_read(const atomic64_t *v
   * @u: ...unless v is equal to u.
   *
   * Atomically adds @a to @v, so long as it was not @u.
 - * Returns non-zero if @v was not @u, and zero otherwise.
 + * Returns the old value of @v.
   */
  static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
  {
@@@ -335,7 -336,12 +335,7 @@@
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
  
 -#else /* CONFIG_64BIT */
 -
 -#include <asm-generic/atomic64.h>
 -
  #endif /* !CONFIG_64BIT */
  
 -#include <asm-generic/atomic-long.h>
  
  #endif /* _ASM_PARISC_ATOMIC_H_ */