diff options
| author | Vineet Gupta <Vineet.Gupta1@synopsys.com> | 2014-04-18 04:08:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 16:49:15 -0400 |
| commit | 64ee9f32c33cbd53545284742e73c17fedf9d429 (patch) | |
| tree | e2755dcdb56346afa0f8e69094edbba3e1403b0c | |
| parent | 674366e90e5a2430e3ddef40ce51512d681944e4 (diff) | |
ARC: Delete stale barrier.h
Commit 93ea02bb8435 ("arch: Clean up asm/barrier.h implementations")
wired generic barrier.h for ARC, but failed to delete the existing file.
In 3.15, due to rcupdate.h updates, this causes a build breakage on ARC:
CC arch/arc/kernel/asm-offsets.s
In file included from include/linux/sched.h:45:0,
from arch/arc/kernel/asm-offsets.c:9:
include/linux/rculist.h: In function __list_add_rcu:
include/linux/rculist.h:54:2: error: implicit declaration of function smp_store_release [-Werror=implicit-function-declaration]
rcu_assign_pointer(list_next_rcu(prev), new);
^
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/arc/include/asm/barrier.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/arc/include/asm/barrier.h b/arch/arc/include/asm/barrier.h deleted file mode 100644 index c32245c3d1e9..000000000000 --- a/arch/arc/include/asm/barrier.h +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef __ASM_BARRIER_H | ||
| 10 | #define __ASM_BARRIER_H | ||
| 11 | |||
| 12 | #ifndef __ASSEMBLY__ | ||
| 13 | |||
| 14 | /* TODO-vineetg: Need to see what this does, don't we need sync anywhere */ | ||
| 15 | #define mb() __asm__ __volatile__ ("" : : : "memory") | ||
| 16 | #define rmb() mb() | ||
| 17 | #define wmb() mb() | ||
| 18 | #define set_mb(var, value) do { var = value; mb(); } while (0) | ||
| 19 | #define set_wmb(var, value) do { var = value; wmb(); } while (0) | ||
| 20 | #define read_barrier_depends() mb() | ||
| 21 | |||
| 22 | /* TODO-vineetg verify the correctness of macros here */ | ||
| 23 | #ifdef CONFIG_SMP | ||
| 24 | #define smp_mb() mb() | ||
| 25 | #define smp_rmb() rmb() | ||
| 26 | #define smp_wmb() wmb() | ||
| 27 | #else | ||
| 28 | #define smp_mb() barrier() | ||
| 29 | #define smp_rmb() barrier() | ||
| 30 | #define smp_wmb() barrier() | ||
| 31 | #endif | ||
| 32 | |||
| 33 | #define smp_read_barrier_depends() do { } while (0) | ||
| 34 | |||
| 35 | #endif | ||
| 36 | |||
| 37 | #endif | ||
