diff options
| author |   Brian Norris <computersforpeace@gmail.com> | 2015-05-18 10:50:43 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-05-18 10:50:43 -0700 |
| commit | 2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49 (patch) | |
| tree | 10924a4ec59c9b2d114c2287bd35e6debc72595f /include/linux/compiler.h | |
| parent | MAINTAINERS: add entry for new brcmnand/ directory (diff) | |
| parent | Linux 4.1-rc4 (diff) | |
Merge tag 'v4.1-rc4' into MTD's -next
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) |