delete queue-3.14/arch-hexagon-convert-smp_mb__.patch

diff --git a/queue-3.14/arch-hexagon-convert-smp_mb__.patch b/queue-3.14/arch-hexagon-convert-smp_mb__.patch
deleted file mode 100644 (file)
index 7ed101b..0000000
--- a/queue-3.14/arch-hexagon-convert-smp_mb__.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 94cf42f823bc904305b0ee93a09bcd51ba380497 Mon Sep 17 00:00:00 2001
-From: Peter Zijlstra <peterz@infradead.org>
-Date: Thu, 13 Mar 2014 19:00:36 +0100
-Subject: arch,hexagon: Convert smp_mb__*()
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-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().
-
-Signed-off-by: Peter Zijlstra <peterz@infradead.org>
-Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Link: http://lkml.kernel.org/n/tip-87irqrrbgizeojjfdqhypud3@git.kernel.org
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Richard Kuo <rkuo@codeaurora.org>
-Cc: Vineet Gupta <vgupta@synopsys.com>
-Cc: linux-hexagon@vger.kernel.org
-Cc: linux-kernel@vger.kernel.org
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/hexagon/include/asm/atomic.h |    6 +-----
- arch/hexagon/include/asm/bitops.h |    4 +---
- 2 files changed, 2 insertions(+), 8 deletions(-)
-
---- a/arch/hexagon/include/asm/atomic.h
-+++ b/arch/hexagon/include/asm/atomic.h
-@@ -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
---- a/arch/hexagon/include/asm/bitops.h
-+++ b/arch/hexagon/include/asm/bitops.h
-@@ -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),

diff --git a/queue-3.14/series b/queue-3.14/series
index 43755eb7df206c7fc23fed6266f56f2707ff7c65..181eae9c7409e715ee7610137cbe386dc3e011be 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -58,7 +58,6 @@ usb-use-the-usb_ss_mult-macro-to-get-the-burst-multiplier.patch
 usb-add-device-quirk-for-logitech-ptz-cameras.patch
 usb-add-reset-resume-quirk-for-two-plantronics-usb-headphones.patch
 mips-dma-default-fix-32-bit-fall-back-to-gfp_dma.patch
-arch-hexagon-convert-smp_mb__.patch
 staging-comedi-usbduxsigma-don-t-clobber-ai_timer-in-command-test.patch
 staging-comedi-usbduxsigma-don-t-clobber-ao_timer-in-command-test.patch
 md-flush-event_work-before-stopping-array.patch