diff options
| author | Mark Brown <broonie@kernel.org> | 2019-10-18 18:30:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-10-18 18:30:49 +0100 |
| commit | 112d6212c80a1c560757520bd822a41c0ad15c2c (patch) | |
| tree | 051580f1a55aa8d1b59120f21767a624d0291dbc /scripts/gcc-plugins/randomize_layout_plugin.c | |
| parent | 3e5ec1db8bfee845d9f8560d1c64aeaccd586398 (diff) | |
| parent | 4f5cafb5cb8471e54afdc9054d973535614f7675 (diff) | |
Merge tag 'v5.4-rc3' into spi-5.4
Linux 5.4-rc3
Diffstat (limited to 'scripts/gcc-plugins/randomize_layout_plugin.c')
| -rw-r--r-- | scripts/gcc-plugins/randomize_layout_plugin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/gcc-plugins/randomize_layout_plugin.c b/scripts/gcc-plugins/randomize_layout_plugin.c index 6d5bbd31db7f..bd29e4e7a524 100644 --- a/scripts/gcc-plugins/randomize_layout_plugin.c +++ b/scripts/gcc-plugins/randomize_layout_plugin.c @@ -443,13 +443,13 @@ static int is_pure_ops_struct(const_tree node) if (node == fieldtype) continue; - if (!is_fptr(fieldtype)) - return 0; - - if (code != RECORD_TYPE && code != UNION_TYPE) + if (code == RECORD_TYPE || code == UNION_TYPE) { + if (!is_pure_ops_struct(fieldtype)) + return 0; continue; + } - if (!is_pure_ops_struct(fieldtype)) + if (!is_fptr(fieldtype)) return 0; } |