D18557.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18557.diff
View Options

	Index: head/sys/mips/include/atomic.h
	===================================================================
	--- head/sys/mips/include/atomic.h
	+++ head/sys/mips/include/atomic.h
	@@ -392,10 +392,10 @@
	return (atomic_cmpset_32(p, cmpval, newval));
	}

	-static __inline uint32_t
	+static __inline int
	atomic_fcmpset_32(__volatile uint32_t p, uint32_t cmpval, uint32_t newval)
	{
	- uint32_t ret;
	+ int ret;

	__asm __volatile (
	"1:\n\t"
	@@ -415,7 +415,7 @@
	return ret;
	}

	-static __inline uint32_t
	+static __inline int
	atomic_fcmpset_acq_32(__volatile uint32_t p, uint32_t cmpval, uint32_t newval)
	{
	int retval;
	@@ -425,7 +425,7 @@
	return (retval);
	}

	-static __inline uint32_t
	+static __inline int
	atomic_fcmpset_rel_32(__volatile uint32_t p, uint32_t cmpval, uint32_t newval)
	{
	mips_sync();
	@@ -502,10 +502,10 @@
	return (atomic_cmpset_64(p, cmpval, newval));
	}

	-static __inline uint32_t
	+static __inline int
	atomic_fcmpset_64(__volatile uint64_t p, uint64_t cmpval, uint64_t newval)
	{
	- uint32_t ret;
	+ int ret;

	__asm __volatile (
	"1:\n\t"
	@@ -526,7 +526,7 @@
	return ret;
	}

	-static __inline uint64_t
	+static __inline int
	atomic_fcmpset_acq_64(__volatile uint64_t p, uint64_t cmpval, uint64_t newval)
	{
	int retval;
	@@ -536,7 +536,7 @@
	return (retval);
	}

	-static __inline uint64_t
	+static __inline int
	atomic_fcmpset_rel_64(__volatile uint64_t p, uint64_t cmpval, uint64_t newval)
	{
	mips_sync();