diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-24 12:24:39 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-24 12:24:39 +0400 |
| commit | 89c8ae73459443eabfd7f24b4379ddb9248f1ee9 (patch) | |
| tree | e13e7c3a780668da718161305f2d1741c0b7ae6f /arch/x86/include/asm/barrier.h | |
| parent | 2df6742f613840a0b0a1590fb28f7af5b058a673 (diff) | |
| parent | e090d5b6ad20056ec0ef58727e3ae95fd82be090 (diff) | |
| download | linux-89c8ae73459443eabfd7f24b4379ddb9248f1ee9.tar.xz | |
Merge tag 'asoc-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.15
A few more updates for the merge window:
- Fixes for the simple-card DAI format DT mess.
- A new driver for Cirrus cs42xx8 devices.
- DT support for a couple more devices.
- A revert of a previous buggy fix for soc-pcm, plus a few more fixes
and cleanups.
Diffstat (limited to 'arch/x86/include/asm/barrier.h')
| -rw-r--r-- | arch/x86/include/asm/barrier.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index 04a48903b2eb..69bbb4845020 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -85,11 +85,7 @@ #else # define smp_rmb() barrier() #endif -#ifdef CONFIG_X86_OOSTORE -# define smp_wmb() wmb() -#else -# define smp_wmb() barrier() -#endif +#define smp_wmb() barrier() #define smp_read_barrier_depends() read_barrier_depends() #define set_mb(var, value) do { (void)xchg(&var, value); } while (0) #else /* !SMP */ @@ -100,7 +96,7 @@ #define set_mb(var, value) do { var = value; barrier(); } while (0) #endif /* SMP */ -#if defined(CONFIG_X86_OOSTORE) || defined(CONFIG_X86_PPRO_FENCE) +#if defined(CONFIG_X86_PPRO_FENCE) /* * For either of these options x86 doesn't have a strong TSO memory |