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/path.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/path.h')
| -rw-r--r-- | include/linux/path.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/path.h b/include/linux/path.h index d1372186f431..cde895cc4af4 100644 --- a/include/linux/path.h +++ b/include/linux/path.h @@ -7,7 +7,7 @@ struct vfsmount; struct path { struct vfsmount *mnt; struct dentry *dentry; -}; +} __randomize_layout; extern void path_get(const struct path *); extern void path_put(const struct path *); |