projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove temporary config-host.h
[qemu]
/
qemu-lock.h
diff --git
a/qemu-lock.h
b/qemu-lock.h
index
fdd8da9
..
26661ba
100644
(file)
--- a/
qemu-lock.h
+++ b/
qemu-lock.h
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
*/
/* Locking primitives. Most of this code should be redundant -
*/
/* Locking primitives. Most of this code should be redundant -
@@
-58,17
+58,16
@@
static inline void resetlock (spinlock_t *p)
#endif
#endif
-#if defined(__powerpc__)
+#if defined(_ARCH_PPC)
static inline int testandset (int *p)
{
int ret;
__asm__ __volatile__ (
static inline int testandset (int *p)
{
int ret;
__asm__ __volatile__ (
- "0: lwarx %0,0,%1\n"
+ " lwarx %0,0,%1\n"
" xor. %0,%3,%0\n"
" xor. %0,%3,%0\n"
- " bne 1f\n"
+ " bne $+12\n"
" stwcx. %2,0,%1\n"
" stwcx. %2,0,%1\n"
- " bne- 0b\n"
- "1: "
+ " bne- $-16\n"
: "=&r" (ret)
: "r" (p), "r" (1), "r" (0)
: "cr0", "memory");
: "=&r" (ret)
: "r" (p), "r" (1), "r" (0)
: "cr0", "memory");