From: Greg Kroah-Hartman Date: Mon, 19 Oct 2015 20:09:18 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v3.10.91~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1de5c618ca06983f4956c2fd2973b1bb522a4727;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: arc-hexagon-delete-asm-barrier.h.patch --- diff --git a/queue-3.14/arc-hexagon-delete-asm-barrier.h.patch b/queue-3.14/arc-hexagon-delete-asm-barrier.h.patch new file mode 100644 index 00000000000..15ed09c0de3 --- /dev/null +++ b/queue-3.14/arc-hexagon-delete-asm-barrier.h.patch @@ -0,0 +1,67 @@ +From 2ab08ee9f0a4eba27c7c4ce0b6d5118e8a18554b Mon Sep 17 00:00:00 2001 +From: Peter Zijlstra +Date: Thu, 6 Feb 2014 14:26:10 +0100 +Subject: arc,hexagon: Delete asm/barrier.h + +From: Peter Zijlstra + +commit 2ab08ee9f0a4eba27c7c4ce0b6d5118e8a18554b upstream. + +Both already use asm-generic/barrier.h as per their +include/asm/Kbuild. Remove the stale files. + +Signed-off-by: Peter Zijlstra +Acked-by: Paul E. McKenney +Link: http://lkml.kernel.org/n/tip-c7vlkshl3tblim0o8z2p70kt@git.kernel.org +Cc: Linus Torvalds +Cc: Richard Kuo +Cc: Vineet Gupta +Cc: linux-hexagon@vger.kernel.org +Cc: linux-kernel@vger.kernel.org +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + arch/hexagon/include/asm/barrier.h | 37 ------------------------------------- + 1 file changed, 37 deletions(-) + +--- a/arch/hexagon/include/asm/barrier.h ++++ /dev/null +@@ -1,37 +0,0 @@ +-/* +- * Memory barrier definitions for the Hexagon architecture +- * +- * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved. +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License version 2 and +- * only version 2 as published by the Free Software Foundation. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +- * 02110-1301, USA. +- */ +- +-#ifndef _ASM_BARRIER_H +-#define _ASM_BARRIER_H +- +-#define rmb() barrier() +-#define read_barrier_depends() barrier() +-#define wmb() barrier() +-#define mb() barrier() +-#define smp_rmb() barrier() +-#define smp_read_barrier_depends() barrier() +-#define smp_wmb() barrier() +-#define smp_mb() barrier() +- +-/* Set a value and use a memory barrier. Used by the scheduler somewhere. */ +-#define set_mb(var, value) \ +- do { var = value; mb(); } while (0) +- +-#endif /* _ASM_BARRIER_H */ diff --git a/queue-3.14/series b/queue-3.14/series index 2d1edbf5a4a..43755eb7df2 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -77,3 +77,4 @@ dm-cache-fix-null-pointer-when-switching-from-cleaner-policy.patch staging-speakup-fix-speakup-r-regression.patch mm-slab-fix-unexpected-index-mapping-result-of-kmalloc_size-index_node-1.patch 3w-9xxx-don-t-unmap-bounce-buffered-commands.patch +arc-hexagon-delete-asm-barrier.h.patch