diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 10:13:41 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 10:13:41 +0200 |
| commit | 8becdc18c3e1f855cae5af266f6a1f5ce5af24fb (patch) | |
| tree | c42e2d4274b1aa17a7822385535ac8524e4a6822 /include/linux/compiler.h | |
| parent | 3c1b5c9bd991d1c023f736b0187582aae8a5b30a (diff) | |
| parent | 030bbdbf4c833bc69f502eae58498bc5572db736 (diff) | |
Merge tag 'v4.1-rc3' into devel
Linux 4.1-rc3
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 0e41ca0e5927..867722591be2 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -169,6 +169,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); # define barrier() __memory_barrier() #endif +#ifndef barrier_data +# define barrier_data(ptr) barrier() +#endif + /* Unreachable code */ #ifndef unreachable # define unreachable() do { } while (1) |