diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-02-23 10:01:19 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-02-23 10:01:19 -0800 |
| commit | 69e00cef97bb96d239faed903d4958da88ed3950 (patch) | |
| tree | 76f49a66b5e087dc67eb1f04ea43efe53bebf7b5 /scripts | |
| parent | e6f9b6c0af2d99803e54001d644246a0e581eba6 (diff) | |
| parent | 8d33d083a29a7761ae3a0a9d97751a1a3a469fc5 (diff) | |
Merge "Merge android-4.9-o.81 (1b9d719) into msm-4.9"
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mod/modpost.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 845eb9b800f39..238db4ffd30c0 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -2130,6 +2130,14 @@ static void add_intree_flag(struct buffer *b, int is_intree) buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n"); } +/* Cannot check for assembler */ +static void add_retpoline(struct buffer *b) +{ + buf_printf(b, "\n#ifdef RETPOLINE\n"); + buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n"); + buf_printf(b, "#endif\n"); +} + static void add_staging_flag(struct buffer *b, const char *name) { static const char *staging_dir = "drivers/staging"; @@ -2474,6 +2482,7 @@ int main(int argc, char **argv) add_header(&buf, mod); add_intree_flag(&buf, !external_module); + add_retpoline(&buf); add_staging_flag(&buf, mod->name); err |= add_versions(&buf, mod); add_depends(&buf, mod, modules); |