diff options
| author | Borislav Petkov <bp@suse.de> | 2019-02-02 12:45:17 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-02-02 12:45:17 +0300 |
| commit | 84ba10d633f1e8886e62bfd88e1b04ea28310483 (patch) | |
| tree | cdea4b31d0e59393cccdfb31aa283d00d1836012 /scripts | |
| parent | 912ebd99edfa1d1695083fa6d34ac878346ac66b (diff) | |
| parent | e6d429313ea5c776d2e76b4494df69102e6b7115 (diff) | |
| download | linux-84ba10d633f1e8886e62bfd88e1b04ea28310483.tar.xz | |
Merge remote-tracking branch 'tip/x86/urgent' into edac-for-5.1
... to pick up dependent change:
00ae831dfe44 ("x86/cpu: Add Atom Tremont (Jacobsville)")
introducing the model number define which will be needed by the new
i10nm_edac driver for 10nm Intel Atoms.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mod/modpost.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 0de2fb236640..26bf886bd168 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -2185,7 +2185,7 @@ static void add_intree_flag(struct buffer *b, int is_intree) /* Cannot check for assembler */ static void add_retpoline(struct buffer *b) { - buf_printf(b, "\n#ifdef RETPOLINE\n"); + buf_printf(b, "\n#ifdef CONFIG_RETPOLINE\n"); buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n"); buf_printf(b, "#endif\n"); } |