diff options
author | Sean Paul <seanpaul@chromium.org> | 2017-07-26 18:39:07 -0400 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2017-07-26 18:39:07 -0400 |
commit | 78acea381d6eb1c67b155e7e2638ba3b1728eb07 (patch) | |
tree | 323b89e2f43f5f177223aeb61a6a18fe12eda011 /include/linux/compiler.h | |
parent | 67022227ffb1f588e70deeccc9246ec93e26f980 (diff) | |
parent | e6742e1021a5cec55fab50a0b115c65217488eda (diff) |
Merge airlied/drm-next into drm-misc-next
Backmerge drm-next with -rc2 in it to pull in a couple stm patches that
were previously incorrectly applied to -misc-next. By picking them up in
the correct manner, git will hopefully fix any errant trees that are out
in the wild.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'include/linux/compiler.h')
-rw-r--r-- | include/linux/compiler.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 219f82f3ec1a..eca8ad75e28b 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -452,6 +452,11 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s # define __no_randomize_layout #endif +#ifndef randomized_struct_fields_start +# define randomized_struct_fields_start +# define randomized_struct_fields_end +#endif + /* * Tell gcc if a function is cold. The compiler will assume any path * directly leading to the call is unlikely. |