# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1292526251 0
# Node ID ca86364254bb523c67fc9573fbf1146ed241ebd5
# Parent 6754771bf10181cc83de84778be40bb62ec2093d
x86/bitops.h: Remove unused smp_mb__* macros
Signed-off-by: Keir Fraser <keir@xxxxxxx>
---
xen/arch/x86/acpi/cpu_idle.c | 10 ++--------
xen/include/asm-x86/bitops.h | 8 +-------
2 files changed, 3 insertions(+), 15 deletions(-)
diff -r 6754771bf101 -r ca86364254bb xen/arch/x86/acpi/cpu_idle.c
--- a/xen/arch/x86/acpi/cpu_idle.c Thu Dec 16 19:01:35 2010 +0000
+++ b/xen/arch/x86/acpi/cpu_idle.c Thu Dec 16 19:04:11 2010 +0000
@@ -220,12 +220,6 @@ static uint64_t acpi_pm_ticks_elapsed(ui
return ((0xFFFFFFFF - t1) + t2 +1);
}
-static void acpi_safe_halt(void)
-{
- smp_mb__after_clear_bit();
- safe_halt();
-}
-
#define MWAIT_ECX_INTERRUPT_BREAK (0x1)
/*
@@ -296,7 +290,7 @@ static void acpi_idle_do_entry(struct ac
unused = inl(pmtmr_ioport);
return;
case ACPI_CSTATE_EM_HALT:
- acpi_safe_halt();
+ safe_halt();
local_irq_disable();
return;
}
@@ -402,7 +396,7 @@ static void acpi_processor_idle(void)
if ( pm_idle_save )
pm_idle_save();
else
- acpi_safe_halt();
+ safe_halt();
return;
}
diff -r 6754771bf101 -r ca86364254bb xen/include/asm-x86/bitops.h
--- a/xen/include/asm-x86/bitops.h Thu Dec 16 19:01:35 2010 +0000
+++ b/xen/include/asm-x86/bitops.h Thu Dec 16 19:04:11 2010 +0000
@@ -70,10 +70,7 @@ static inline void __set_bit(int nr, vol
* @nr: Bit to clear
* @addr: Address to start counting from
*
- * clear_bit() is atomic and may not be reordered. However, it does
- * not contain a memory barrier, so if it is used for locking purposes,
- * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
- * in order to ensure changes are visible on other processors.
+ * clear_bit() is atomic and may not be reordered.
*/
static inline void clear_bit(int nr, volatile void *addr)
{
@@ -107,9 +104,6 @@ static inline void __clear_bit(int nr, v
if ( bitop_bad_size(addr) ) __bitop_bad_size(); \
__clear_bit(nr, addr); \
})
-
-#define smp_mb__before_clear_bit() ((void)0)
-#define smp_mb__after_clear_bit() ((void)0)
/**
* __change_bit - Toggle a bit in memory
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home