From 22c7c5e74870d4f70f85d198cb1fedc2c29224cd Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Thu, 7 Feb 2002 10:40:03 +0000
Subject: * sysdeps/mips/atomicity.h (exchange_and_add): Not use branch

	likely.
	(atomic_add): Likewise.
	(compare_and_swap): Likewise.
	* sysdeps/unix/sysv/linux/mips/sys/tas.h (_test_and_set):
	Likewise.
---
 linuxthreads/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'linuxthreads')

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 7617d651fa..d7af2dcedc 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -16,7 +16,6 @@
 	* sysdeps/i386/tls.h: Add TLS definitions also for !FLOATING_STACKS.
 	Define THREAD_GETMEM accordingly.
 
->>>>>>> 1.469
 2002-02-06  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/i386/tls.h: Include <stddef.h> for size_t.
-- 
cgit v1.2.3