Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c6d4dca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha 

Pull alpha architecture fixes from Matt Turner:
 "This contains mostly clean ups and fixes but also an implementation of
  atomic64_dec_if_positive() and a pair of new syscalls"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
  alpha: Use handle_percpu_irq for the timer interrupt
  alpha: Force the user-visible HZ to a constant 1024.
  alpha: Don't if-out dp264_device_interrupt.
  alpha: Use __builtin_alpha_rpcc
  alpha: Fix type compatibility warning for marvel_map_irq
  alpha: Generate dwarf2 unwind info for various kernel entry points.
  alpha: Implement atomic64_dec_if_positive
  alpha: Improve atomic_add_unless
  alpha: Modernize lib/mpi/longlong.h
  alpha: Add kcmp and finit_module syscalls
  alpha: locks: remove unused arch_*_relax operations
  alpha: kernel: typo issue, using '1' instead of '11'
  alpha: kernel: using memcpy() instead of strcpy()
  alpha: Convert print_symbol to %pSR
parents a030cbc3 dff64649

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config ALPHA 
	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_IPC_PARSE_VERSION

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_CMOS_UPDATE

	select GENERIC_STRNCPY_FROM_USER

arch/alpha/include/asm/atomic.h

+65 −23
Original line number Diff line number Diff line
@@ -186,17 +186,24 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) 
 */

static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)

{

	int c, old;

	c = atomic_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c;

	int c, new, old;

	smp_mb();

	__asm__ __volatile__(

	"1:	ldl_l	%[old],%[mem]\n"

	"	cmpeq	%[old],%[u],%[c]\n"

	"	addl	%[old],%[a],%[new]\n"

	"	bne	%[c],2f\n"

	"	stl_c	%[new],%[mem]\n"

	"	beq	%[new],3f\n"

	"2:\n"

	".subsection 2\n"

	"3:	br	1b\n"

	".previous"

	: [old] "=&r"(old), [new] "=&r"(new), [c] "=&r"(c)

	: [mem] "m"(*v), [a] "rI"(a), [u] "rI"((long)u)

	: "memory");

	smp_mb();

	return old;

}
@@ -207,21 +214,56 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u) 
 * @u: ...unless v is equal to u.

 *

 * Atomically adds @a to @v, so long as it was not @u.

 * Returns the old value of @v.

 * Returns true iff @v was not @u.

 */

static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)

{

	long c, old;

	c = atomic64_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic64_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	long c, tmp;

	smp_mb();

	__asm__ __volatile__(

	"1:	ldq_l	%[tmp],%[mem]\n"

	"	cmpeq	%[tmp],%[u],%[c]\n"

	"	addq	%[tmp],%[a],%[tmp]\n"

	"	bne	%[c],2f\n"

	"	stq_c	%[tmp],%[mem]\n"

	"	beq	%[tmp],3f\n"

	"2:\n"

	".subsection 2\n"

	"3:	br	1b\n"

	".previous"

	: [tmp] "=&r"(tmp), [c] "=&r"(c)

	: [mem] "m"(*v), [a] "rI"(a), [u] "rI"(u)

	: "memory");

	smp_mb();

	return !c;

}

	return c != (u);



/*

 * atomic64_dec_if_positive - decrement by 1 if old value positive

 * @v: pointer of type atomic_t

 *

 * The function returns the old value of *v minus 1, even if

 * the atomic variable, v, was not decremented.

 */

static inline long atomic64_dec_if_positive(atomic64_t *v)

{

	long old, tmp;

	smp_mb();

	__asm__ __volatile__(

	"1:	ldq_l	%[old],%[mem]\n"

	"	subq	%[old],1,%[tmp]\n"

	"	ble	%[old],2f\n"

	"	stq_c	%[tmp],%[mem]\n"

	"	beq	%[tmp],3f\n"

	"2:\n"

	".subsection 2\n"

	"3:	br	1b\n"

	".previous"

	: [old] "=&r"(old), [tmp] "=&r"(tmp)

	: [mem] "m"(*v)

	: "memory");

	smp_mb();

	return old - 1;

}



#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)

arch/alpha/include/asm/param.h

+5 −3
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ 


#include <uapi/asm/param.h>



# undef HZ

# define HZ		CONFIG_HZ

#define USER_HZ		HZ

# define CLOCKS_PER_SEC	HZ	/* frequency at which times() counts */

# define USER_HZ	1024

# define CLOCKS_PER_SEC	USER_HZ	/* frequency at which times() counts */



#endif /* _ASM_ALPHA_PARAM_H */

arch/alpha/include/asm/spinlock.h

+0 −4
Original line number Diff line number Diff line
@@ -168,8 +168,4 @@ static inline void arch_write_unlock(arch_rwlock_t * lock) 
#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)

#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)



#define arch_spin_relax(lock)	cpu_relax()

#define arch_read_relax(lock)	cpu_relax()

#define arch_write_relax(lock)	cpu_relax()



#endif /* _ALPHA_SPINLOCK_H */

arch/alpha/include/asm/unistd.h

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,7 @@ 


#include <uapi/asm/unistd.h>





#define NR_SYSCALLS			506

#define NR_SYSCALLS			508



#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_STAT64