| commit | 0f672f6c0b52b7b0700b0915c72b540721af4465 | [log] [tgz] |
|---|---|---|
| author | David Brazdil <dbrazdil@google.com> | Tue Dec 10 10:32:29 2019 +0000 |
| committer | David Brazdil <dbrazdil@google.com> | Tue Dec 10 19:03:18 2019 +0000 |
| tree | 85c8cba019caa205e4f8920d72d93f6d6deaf29c | |
| parent | 3a0ad55d848b50499b68d7141d4eca997fce28ef [diff] [blame] |
Update Linux to v5.4.2 Change-Id: Idf6911045d9d382da2cfe01b1edff026404ac8fd
diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c index 0b8cedb..d5c9b13 100644 --- a/arch/x86/kernel/doublefault.c +++ b/arch/x86/kernel/doublefault.c
@@ -65,6 +65,9 @@ .ss = __KERNEL_DS, .ds = __USER_DS, .fs = __KERNEL_PERCPU, +#ifndef CONFIG_X86_32_LAZY_GS + .gs = __KERNEL_STACK_CANARY, +#endif .__cr3 = __pa_nodebug(swapper_pg_dir), };