Patch "arch,hexagon: Convert smp_mb__*()" has been added to the 3.14-stable tree
This is a note to let you know that I've just added the patch titled
arch,hexagon: Convert smp_mb__*()
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arch-hexagon-convert-smp_mb__.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
94cf42f823bc904305b0ee93a09bcd51ba380497Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <[email protected]>
Date: Thu, 13 Mar 2014 19:00:36 +0100
Subject: arch,hexagon: Convert smp_mb__*()
From: Peter Zijlstra <[email protected]>
commit 94cf42f823bc904305b0ee93a09bcd51ba380497 upstream.
Hexagon uses asm-gemeric/barrier.h and its smp_mb() is barrier(). Therefore we can use the default implementation that uses smp_mb().
--- arch/hexagon/include/asm/atomic.h | 6 +----- arch/hexagon/include/asm/bitops.h | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-)
arch/hexagon/include/asm/atomic.h +1 -5
@@ -24,6 +24,7 @@#include <linux/types.h> #include <asm/cmpxchg.h> +#include <asm/barrier.h> #define ATOMIC_INIT (i) { (i) }#define atomic_set (v, i) ((v)->counter = (i))
@@ -163,9 +164,4 @@ static inline int __atomic_add_unless(at#define atomic_inc_return (v) (atomic_add_return(1, v))#define atomic_dec_return (v) (atomic_sub_return(1, v)) -#define smp_mb__before_atomic_dec () barrier() -#define smp_mb__after_atomic_dec () barrier() -#define smp_mb__before_atomic_inc () barrier() -#define smp_mb__after_atomic_inc () barrier() -#endif
arch/hexagon/include/asm/bitops.h +1 -3
@@ -25,12 +25,10 @@#include <linux/compiler.h> #include <asm/byteorder.h> #include <asm/atomic.h> +#include <asm/barrier.h> #ifdef __KERNEL__ -#define smp_mb__before_clear_bit () barrier() -#define smp_mb__after_clear_bit () barrier() -/* * The offset calculations for these are based on BITS_PER_LONG == 32 * (i.e. I get to shift by #5-2 (32 bits per long, 4 bytes per access),
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/x86-efi-fix-boot-crash-by-mapping-efi-memmap-entries-bottom-up-at-runtime-instead-of-top-down.patch queue-3.14/arch-hexagon-convert-smp_mb__.patch queue-3.14/x86-mm-set-nx-on-gap-between-__ex_table-and-rodata.patch queue-3.14/sched-core-fix-task_dead-race-in-finish_task_switch.patch queue-3.14/x86-platform-fix-geode-lx-timekeeping-in-the-generic-x86-build.patch