Just like in the noarch part, drop the remaining atomic ops used for
status manipulation.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
arch/x86/include/asm/ipipe_base.h | 2 --
arch/x86/kernel/ipipe.c | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/ipipe_base.h
b/arch/x86/include/asm/ipipe_base.h
index 44c8c73..8fb76ac 100644
--- a/arch/x86/include/asm/ipipe_base.h
+++ b/arch/x86/include/asm/ipipe_base.h
@@ -131,7 +131,6 @@
static inline void __ipipe_stall_root(void)
{
__asm__ __volatile__(GET_ROOT_STATUS_ADDR
- LOCK_PREFIX
TEST_AND_SET_ROOT_STATUS
PUT_ROOT_STATUS_ADDR
: : : ROOT_TEST_CLOBBER_LIST, "memory");
@@ -142,7 +141,6 @@ static inline unsigned long
__ipipe_test_and_stall_root(void)
int oldbit;
__asm__ __volatile__(GET_ROOT_STATUS_ADDR
- LOCK_PREFIX
TEST_AND_SET_ROOT_STATUS
"sbbl %0,%0;"
PUT_ROOT_STATUS_ADDR
diff --git a/arch/x86/kernel/ipipe.c b/arch/x86/kernel/ipipe.c
index cd63d02..b34cce9 100644
--- a/arch/x86/kernel/ipipe.c
+++ b/arch/x86/kernel/ipipe.c
@@ -420,7 +420,7 @@ void __ipipe_halt_root(void)
p = ipipe_root_cpudom_ptr();
trace_hardirqs_on();
- clear_bit(IPIPE_STALL_FLAG, &p->status);
+ __clear_bit(IPIPE_STALL_FLAG, &p->status);
if (unlikely(__ipipe_ipending_p(p))) {
__ipipe_sync_pipeline();
--
1.7.1
_______________________________________________
Adeos-main mailing list
Adeos-main@gna.org
https://mail.gna.org/listinfo/adeos-main
